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

* commit '5fd7b2bcaee3af68eac59c6417709d1046236dfb':
This commit is contained in:
Kurt Partridge 2013-10-03 11:42:14 -07:00 committed by Android Git Automerger
commit 351d88cf53

Diff content is not available