OSDN Git Service

am c9282823: (-s ours) am e4d510fa: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 13 Oct 2014 22:25:17 +0000 (22:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Oct 2014 22:25:17 +0000 (22:25 +0000)
commit6397b5e2f809596b2a77674dd7a701ede24dc3bb
tree6a02e56e5453c4a24d4daab6aadd1f5f34eaf81a
parentf5b9d136526549198b5cd8f3e626efa33a6631da
parentc92828231993aa2c1a447c37a4a6f9740e950a72
am c9282823: (-s ours) am e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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