OSDN Git Service

am 30765f49: (-s ours) am c8f4e83d: (-s ours) am c3bd8097: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Thu, 24 Jul 2014 23:41:31 +0000 (23:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Jul 2014 23:41:31 +0000 (23:41 +0000)
commit4ad7fa45e459f89907032accc49136d0bf007e98
tree9e7b5c7d1dc712744a6845cc0d67599e4aa5eab8
parent5a67abbbdd62f8e093b5c50fb73bde976e5e5e4a
parent30765f497de684d72287fd26e1cc9696f8ac9617
am 30765f49: (-s ours) am c8f4e83d: (-s ours) am c3bd8097: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '30765f497de684d72287fd26e1cc9696f8ac9617':
  Import translations. DO NOT MERGE