OSDN Git Service

am 61f9ac26: (-s ours) am 9dbd2eeb: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 23 Apr 2014 02:14:55 +0000 (02:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Apr 2014 02:14:55 +0000 (02:14 +0000)
commit3a1c6b73018c96896dab966f5b62521de4bc0120
treed118ec8c8a64722569d0e7d1043817b0b0202628
parentcaeaa375946f251bea59f79f3ba73104e3f4634d
parent61f9ac26fdc1f044c8a5b1541babcffe88ba548b
am 61f9ac26: (-s ours) am 9dbd2eeb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '61f9ac26fdc1f044c8a5b1541babcffe88ba548b':
  Import translations. DO NOT MERGE