OSDN Git Service

am 692a8536: (-s ours) am 262c7bd7: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 31 Oct 2012 16:43:12 +0000 (09:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 31 Oct 2012 16:43:12 +0000 (09:43 -0700)
commit990cdc3814c7144420feff769434185e0a323f65
tree4a8e85dd5f815853bb8a9118224a617b4ef1e191
parentc350cd25ffefdb923f57496df45c47dda628e70e
parent692a8536b790d50c506a7fb9588301eaff5e02c6
am 692a8536: (-s ours) am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '692a8536b790d50c506a7fb9588301eaff5e02c6':
  Import translations. DO NOT MERGE