OSDN Git Service

am 48f0021c: (-s ours) am 0905bb07: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 1 Oct 2014 22:30:42 +0000 (22:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Oct 2014 22:30:42 +0000 (22:30 +0000)
commit8ea8cfabf36f7fb59f4f3fc8c9437a3cde4b539e
tree45536db4a5550136d41fd72bebcd700c1b4f481c
parente9a39e28c21fe6b732e2af13a9c5a658954f749a
parent48f0021cec8943c3027f41faff147b83ba6d991f
am 48f0021c: (-s ours) am 0905bb07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '48f0021cec8943c3027f41faff147b83ba6d991f':
  Import translations. DO NOT MERGE