OSDN Git Service

am 9a036229: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
authorGeoff Mendal <mendal@google.com>
Mon, 16 Mar 2015 12:57:12 +0000 (12:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Mar 2015 12:57:12 +0000 (12:57 +0000)
* commit '9a036229277479c0bc53d850ed5c98b8b69aa080':
  Import translations. DO NOT MERGE


Trivial merge