OSDN Git Service

am f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Fri, 24 Jul 2015 03:13:06 +0000 (03:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Jul 2015 03:13:06 +0000 (03:13 +0000)
commit13cd0b25734e215f3369b0c5367dafdc74c070da
tree40984e6ea98a21acd380f1c567b92ce3b596f1c2
parentcb113be57e3eb49871c77ce5317d644963e033af
parentf305e853a97be420eca536a510d8dca1c9877ef9
am f305e853: (-s ours) am 5376d54e: (-s ours) Import translations. DO NOT MERGE

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