OSDN Git Service

am ecebd474: (-s ours) am 5d806912: (-s ours) am e27c079d: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:19:06 +0000 (11:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:19:06 +0000 (11:19 +0000)
* commit 'ecebd4747c2be6ef7c5cab15ce6158fdb4627a70':


Trivial merge