OSDN Git Service

am 3876ef95: am 5fc2772b: (-s ours) am 01ce80b5: Merge "Remove \'do not translate...
authorAmit Mahajan <amitmahajan@google.com>
Thu, 27 Aug 2015 20:15:24 +0000 (20:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:15:24 +0000 (20:15 +0000)
* commit '3876ef95cada8d7b31f9cac2ad917da6d5acf685':


Trivial merge