OSDN Git Service

am 1303f19b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
authorGeoff Mendal <mendal@google.com>
Wed, 22 Oct 2014 23:58:51 +0000 (23:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 Oct 2014 23:58:51 +0000 (23:58 +0000)
* commit '1303f19b5f11fe492e4531239c28ae807efc2e5b':
  Import translations. DO NOT MERGE


Trivial merge