OSDN Git Service

am b491f832: (-s ours) am 42c0488a: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 23 Apr 2014 02:14:59 +0000 (02:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Apr 2014 02:14:59 +0000 (02:14 +0000)
commit59bb0de92f712a605a9e19bf0b16fcaa32f45dbd
treed118ec8c8a64722569d0e7d1043817b0b0202628
parent3a1c6b73018c96896dab966f5b62521de4bc0120
parentb491f8323893fb751a1b1291ec3f66cdb73ed8c2
am b491f832: (-s ours) am 42c0488a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

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