OSDN Git Service

am 4b4c835b: (-s ours) am 6a641a56: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Thu, 10 Apr 2014 16:01:38 +0000 (16:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 10 Apr 2014 16:01:38 +0000 (16:01 +0000)
commit1a614dafcb1e2562617b395737b27a39078cfe0e
tree08148819c8491daa2d88fdd4bdeedc96b837500f
parent27eebc0f46f97822aad605fe1c6065bcedc93333
parent4b4c835bd9c5d9a815f09c1fb8068f57e47f4c85
am 4b4c835b: (-s ours) am 6a641a56: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly

* commit '4b4c835bd9c5d9a815f09c1fb8068f57e47f4c85':
  Import translations. DO NOT MERGE