OSDN Git Service

am 36a58ecb: (-s ours) am 447a1008: (-s ours) am 650418e5: (-s ours) am f288f992...
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 16:08:50 +0000 (16:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 16:08:50 +0000 (16:08 +0000)
commitcd1ff9e06b8f8cec767d085fdc1497347260595e
treea6adfb5ef9f22585d43e809592e44731437d2237
parentfabf28cfab20fb83b9208c3dac3e9cfa5071b3f9
parent36a58ecb8d978f927a418e4c9719b0609b066a6f
am 36a58ecb: (-s ours) am 447a1008: (-s ours) am 650418e5: (-s ours) am f288f992: (-s ours) Import translations. DO NOT MERGE

* commit '36a58ecb8d978f927a418e4c9719b0609b066a6f':
  Import translations. DO NOT MERGE