OSDN Git Service

am 6f96fcc5: (-s ours) am 321b25a1: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Fri, 12 Sep 2014 23:05:35 +0000 (23:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Sep 2014 23:05:35 +0000 (23:05 +0000)
commitc742cfc716bba4ee2bd6dbe62a42d182baa4b6bd
treecae3409bbd6b8771e483d29b277f10ffa813ffbe
parent52e1946554a45b6034bcf23ed46f3033fe843129
parent6f96fcc5a3fe4530e332935ade3cf061e13b9f24
am 6f96fcc5: (-s ours) am 321b25a1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '6f96fcc5a3fe4530e332935ade3cf061e13b9f24':
  Import translations. DO NOT MERGE