OSDN Git Service

am fb035685: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
authorGeoff Mendal <mendal@google.com>
Thu, 16 Oct 2014 17:45:45 +0000 (17:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Oct 2014 17:45:45 +0000 (17:45 +0000)
* commit 'fb0356852dad1daeb673cdf117193a8421f66aaa':
  Import translations. DO NOT MERGE


Trivial merge