OSDN Git Service

am 197cfdbd: (-s ours) am 6b0a2d21: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:34:52 +0000 (11:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:34:52 +0000 (11:34 +0000)
commit02b262d4bc1c599f32eec0d63aa60f46a24efe74
tree7f84c40aaa75cd61f165f55c1ed04452351a1edd
parentbf68f8d4c89e38667c607ecadd1cc36a0b6362ce
parent197cfdbd2c709cc6198f526dff47d53836b0d251
am 197cfdbd: (-s ours) am 6b0a2d21: (-s ours) Import translations. DO NOT MERGE

* commit '197cfdbd2c709cc6198f526dff47d53836b0d251':