OSDN Git Service

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

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