OSDN Git Service

am 28132bfd: (-s ours) am eff5cd87: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Fri, 16 Aug 2013 00:49:20 +0000 (17:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Aug 2013 00:49:20 +0000 (17:49 -0700)
commit5fffedd507c9b9afcfa2506789c26a6a9687593e
tree76eb4bca6c1a46f382d88097f9dc9f89a8a082a4
parente60ed08cc4a8d0bc16a0d7e860321eaa99776af6
parent28132bfd3e5c99828fe0092c6f7ebe5156b23524
am 28132bfd: (-s ours) am eff5cd87: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '28132bfd3e5c99828fe0092c6f7ebe5156b23524':
  Import translations. DO NOT MERGE