OSDN Git Service

am bda0d8e3: Merge "Mark configuration strings as non-translatable."
authorRobert Greenwalt <rgreenwalt@google.com>
Wed, 20 Aug 2014 23:50:00 +0000 (23:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 20 Aug 2014 23:50:00 +0000 (23:50 +0000)
* commit 'bda0d8e3d6d4ddb5d70351169852693b4c5ec047':
  Mark configuration strings as non-translatable.


Trivial merge