OSDN Git Service

am a673af77: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
authorGeoff Mendal <mendal@google.com>
Thu, 12 Feb 2015 19:20:42 +0000 (19:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Feb 2015 19:20:42 +0000 (19:20 +0000)
* commit 'a673af77d95f4a3d46e5d71188256b27e06cc442':
  Import translations. DO NOT MERGE


Trivial merge