OSDN Git Service

am 2ca1f2a7: am e40d9a1e: (-s ours) Merge "Import translations. DO NOT MERGE" into...
authorBaligh Uddin <baligh@google.com>
Mon, 3 Jun 2013 21:45:22 +0000 (14:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Jun 2013 21:45:22 +0000 (14:45 -0700)
commit2c9a291277f3eb6c13943cdca3fd99c74b2ee3b3
treea91f7bd2f68f120d25fb0d0d0ac7b48a0ac60d86
parenta2a4244b68d49ac565b94830817d9f850e2d6fcf
parent2ca1f2a7a4cec46988bfc95df5ac056316584f98
am 2ca1f2a7: am e40d9a1e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '2ca1f2a7a4cec46988bfc95df5ac056316584f98':
  Import translations. DO NOT MERGE