OSDN Git Service

am c25c92cc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
authorGeoff Mendal <mendal@google.com>
Mon, 20 Oct 2014 23:49:08 +0000 (23:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Oct 2014 23:49:08 +0000 (23:49 +0000)
* commit 'c25c92cccda2f8b1bb02c99f2cf596a703e6c2ce':
  Import translations. DO NOT MERGE


Trivial merge