OSDN Git Service

am 6e523a07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
authorGeoff Mendal <mendal@google.com>
Mon, 17 Nov 2014 22:58:24 +0000 (22:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Nov 2014 22:58:24 +0000 (22:58 +0000)
commitdb5901244a6c64d9d042370fe6eff5ac89882568
tree7b71921ba3dc63ddf03175b7c3e5eeba42f66408
parent913f829549a60045b005f1a1adb6e8562ed47a1a
parent6e523a077f3f6257019057091d8a962ff56fe882
am 6e523a07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '6e523a077f3f6257019057091d8a962ff56fe882':
  Import translations. DO NOT MERGE