OSDN Git Service

am 0172dfef: (-s ours) am 4909c412: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 16 Oct 2014 17:45:39 +0000 (17:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Oct 2014 17:45:39 +0000 (17:45 +0000)
commita3d19546b7792539a7cc8f104c0873d1a9c83717
tree2e4ba8ceb1a3b58ce5394f15defeb376c473d103
parent628d83e736f2f9e606327f3debe2930bb24a83e9
parent0172dfef41dbd728b603d470bc4650290a2276b4
am 0172dfef: (-s ours) am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '0172dfef41dbd728b603d470bc4650290a2276b4':
  Import translations. DO NOT MERGE