OSDN Git Service

am db590124: (-s ours) am 6e523a07: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Tue, 18 Nov 2014 02:05:40 +0000 (02:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Nov 2014 02:05:40 +0000 (02:05 +0000)
commitbb12bfb1a647ac2a30476b4585be5c9f3af28548
treee5bb9f40a6b0b3b30b28ccf3199d5ec966f31b27
parente473ed7bdc31561332ee99b8211cf1fd5e3678f4
parentdb5901244a6c64d9d042370fe6eff5ac89882568
am db590124: (-s ours) am 6e523a07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'db5901244a6c64d9d042370fe6eff5ac89882568':
  Import translations. DO NOT MERGE