OSDN Git Service

am 0f1acda2: (-s ours) am 03b392d9: (-s ours) am 91225f8b: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Fri, 12 Sep 2014 23:06:12 +0000 (23:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Sep 2014 23:06:12 +0000 (23:06 +0000)
commiteee44b535bbb617bf03c76038dcd4bfbae4ff0f7
treec789c09af06ed9e8a6601a09f71c88fbf430fb1a
parent7756833e8a9fe9ffe3e9e97c106f2191969a5143
parent0f1acda2713c7581ea99ef1e9186d4eee9b8f4cb
am 0f1acda2: (-s ours) am 03b392d9: (-s ours) am 91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '0f1acda2713c7581ea99ef1e9186d4eee9b8f4cb':
  Import translations. DO NOT MERGE