OSDN Git Service

am 4475b771: (-s ours) am e6f7a8bf: (-s ours) am 53f771d8: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 20:19:49 +0000 (20:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:19:49 +0000 (20:19 +0000)
* commit '4475b7712f75e1d6d1adf6064b35f7818c66081a':


Trivial merge