OSDN Git Service

am 8bd7ff68: am e8124973: am f3dd4ce8: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Fri, 12 Oct 2012 00:10:28 +0000 (17:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Oct 2012 00:10:28 +0000 (17:10 -0700)
commita63499a1aeeefd96b14bc1ef8376a4b6074e925d
treee93cc73d081622ee156e8a195cd5cf050c658977
parentf64a3a4dcd4aaa39c14fdd7e66b3fdfd2f90caf8
parent8bd7ff68a14acc362b8bd8aad024da874eb6b31a
am 8bd7ff68: am e8124973: am f3dd4ce8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '8bd7ff68a14acc362b8bd8aad024da874eb6b31a':
  Import translations. DO NOT MERGE