OSDN Git Service

am e22700ac: (-s ours) am 611dd7b7: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 23 Apr 2014 02:15:21 +0000 (02:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Apr 2014 02:15:21 +0000 (02:15 +0000)
commitd66b10db019ac079a1f0b6f357bbc140922f248c
treed118ec8c8a64722569d0e7d1043817b0b0202628
parentc925a37100015314a15b1b6eed68f39c8c657839
parente22700ac5bda54aed59193b6f8fad838830ab0aa
am e22700ac: (-s ours) am 611dd7b7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

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