OSDN Git Service

am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 27 Nov 2013 20:39:48 +0000 (12:39 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 Nov 2013 20:39:48 +0000 (12:39 -0800)
* commit 'fa1df42735a7d0ef98a2c1d69d9fbe41be9d73d9':
  Import translations. DO NOT MERGE


Trivial merge