am 5062442f: am 14dd52b8: Merge "Adjust settings for development-only versions"

* commit '5062442fd5186105adb862d27e2a2170a37311ab':
main
Kurt Partridge 2013-09-26 05:47:47 -07:00 committed by Android Git Automerger
commit 051d61ba6d

Diff Content Not Available