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

* commit '051d61ba6ddb995ed071c3cb9811262957ebcaa6':
main
Kurt Partridge 2013-09-26 07:09:56 -07:00 committed by Android Git Automerger
commit 5fd7b2bcae

Diff Content Not Available