OSDN Git Service

am fc2f256c: (-s ours) am 7969be0b: (-s ours) am 5c7015d7: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Sat, 16 Aug 2014 04:20:11 +0000 (04:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 16 Aug 2014 04:20:11 +0000 (04:20 +0000)
commit72cb74b484d83d5773538f85008b2b12cab51ccb
treec5581aeefcf428301570147204faed4d3c535b5e
parent2b49f014e94417e851b1b990bae2499219b13a7d
parent1df29f0889f3615e50dd74e8138b4600528843c5
am fc2f256c: (-s ours) am 7969be0b: (-s ours) am 5c7015d7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

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