OSDN Git Service

am 8a12d17b: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 13 Aug 2015 05:04:41 +0000 (05:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Aug 2015 05:04:41 +0000 (05:04 +0000)
commit93d1612d160f3e71c6dead490a36a334f6abb25f
treefc908582f07b67e76a71cf51f93bc62d5f00cef1
parente9639b1d0141ce25548105a17eab3e30b6341f1a
parent8a12d17b09281f09adaf6685680f7cb991aef049
am 8a12d17b: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE

* commit '8a12d17b09281f09adaf6685680f7cb991aef049':
  Import translations. DO NOT MERGE