OSDN Git Service

am e9f87a45: (-s ours) am a1960823: (-s ours) am 30032b95: (-s ours) am ae7c180a...
authorBaligh Uddin <baligh@google.com>
Fri, 19 Sep 2014 23:31:05 +0000 (23:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 23:31:05 +0000 (23:31 +0000)
commit2e2cfb4166c69c6f56901cbdbde1fa7b184124a4
tree629680ca1dc5ada98ca489f0daf2ebb72d725f66
parent352c666c55477b5f87507757bf0c18018e5e214b
parente9f87a458b5a9e61501f60c5728f5c7a93a327cd
am e9f87a45: (-s ours) am a1960823: (-s ours) am 30032b95: (-s ours) am ae7c180a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

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