OSDN Git Service

am e450d931: (-s ours) Merge "Revert "Revert "Import translations. DO NOT MERGE"...
authorGeoff Mendal <mendal@google.com>
Wed, 5 Feb 2014 22:44:15 +0000 (14:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 5 Feb 2014 22:44:15 +0000 (14:44 -0800)
* commit 'e450d9311b2b5a9157cebdf73850f9a760a3c76d':
  Revert "Revert "Import translations. DO NOT MERGE""


Trivial merge