OSDN Git Service

am 28999ebb: (-s ours) am a1ed7f2f: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Thu, 17 Jul 2014 17:03:24 +0000 (17:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Jul 2014 17:03:24 +0000 (17:03 +0000)
commit4e11a8d01885e6afa1847dc00e4107ec17ba6093
tree5e659a3a1e014be37ec5b83930afc77c41a385be
parentc0cac5fb50d127332de71cc738c05c8c8fdc41b3
parent28999ebb5feed6fab786fd85cd11975f681ae3c6
am 28999ebb: (-s ours) am a1ed7f2f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '28999ebb5feed6fab786fd85cd11975f681ae3c6':
  Import translations. DO NOT MERGE