OSDN Git Service

am ed8c4096: (-s ours) am 71b82aed: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 23 Apr 2014 02:15:06 +0000 (02:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Apr 2014 02:15:06 +0000 (02:15 +0000)
commitb86eb2b8b75a65e69331256c026df68fe687bf57
treed118ec8c8a64722569d0e7d1043817b0b0202628
parent4ae0268ec57c5b4a683d685c209942dc2d0b78d7
parented8c4096192b247d431bde149518ef87ba7e331a
am ed8c4096: (-s ours) am 71b82aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

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