OSDN Git Service

am 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Thu, 6 Aug 2015 04:32:56 +0000 (04:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Aug 2015 04:32:56 +0000 (04:32 +0000)
* commit '05facd935a44d882ca6f5e0ee7b3b1cffd1c0ad4':
  Import translations. DO NOT MERGE


Trivial merge