OSDN Git Service

am f2f31a63: am 8275abe7: (-s ours) am 5583758a: (-s ours) Merge "Import translations...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:50:18 +0000 (15:50 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:50:18 +0000 (15:50 -0800)
commit82d5861ef0874fdc02c5c151b67a96620e02b00f
tree3a5f097a20836ab85a99a015604ce2d66773866e
parented035ad14569dd55234026f816e61089a077b0c5
parentf2f31a63fbcb97da3ba7140ab4689b5d90bdda84
am f2f31a63: am 8275abe7: (-s ours) am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit 'f2f31a63fbcb97da3ba7140ab4689b5d90bdda84':