OSDN Git Service

am ee0939a9: (-s ours) am 4eb23cf3: am ff601b23: am 1a2512cf: (-s ours) am 38c5d92c...
authorBaligh Uddin <baligh@google.com>
Tue, 6 Nov 2012 00:02:15 +0000 (16:02 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 00:02:15 +0000 (16:02 -0800)
commit88a87e02459d0386779eb3afb37db2cc84d07f63
treef5fd1d68ca06b6b610d85cb0084adf5d0c4f9822
parent9f4cade676807ee090c90b7917126ee230dd13ff
parentee0939a9f17404553c1f37a9e3ec46beac8d63d4
am ee0939a9: (-s ours) am 4eb23cf3: am ff601b23: am 1a2512cf: (-s ours) am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit 'ee0939a9f17404553c1f37a9e3ec46beac8d63d4':