OSDN Git Service

am d1a87a4a: (-s ours) am d0249808: (-s ours) am 661dbf01: (-s ours) am 4a332ee8...
authorGeoff Mendal <mendal@google.com>
Wed, 8 Jul 2015 16:33:55 +0000 (16:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jul 2015 16:33:55 +0000 (16:33 +0000)
commit4dac108977026b0fdf943b74f443cc127a4c8cd9
tree429cef25e0f23d67f6d1325199891bfb8bc9a3b7
parentd355c8935840d69c87f37154c33dc1f5b0dfcebb
parentd1a87a4a39d588ed320df69dde741968cb41da20
am d1a87a4a: (-s ours) am d0249808: (-s ours) am 661dbf01: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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