OSDN Git Service

am cb113be5: (-s ours) am 28718aeb: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Fri, 24 Jul 2015 03:26:33 +0000 (03:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Jul 2015 03:26:33 +0000 (03:26 +0000)
commit03fe71ed0067a1c6937569ade4c583a914034173
tree17f8f9ac3881e00aad5c2d63bb552708e181ed05
parentea80c4b2512a79e964968e235c85b145a089d3b9
parentcb113be57e3eb49871c77ce5317d644963e033af
am cb113be5: (-s ours) am 28718aeb: (-s ours) Import translations. DO NOT MERGE

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