OSDN Git Service

am 5c9c8ac3: am 5116f2fd: (-s ours) am a4e538e0: (-s ours) Merge "Import translations...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:49:23 +0000 (15:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:49:23 +0000 (15:49 -0800)
commita6b039ac51b195e8c4e0ebc152741d61c6ce1c6b
tree3a5f097a20836ab85a99a015604ce2d66773866e
parent5da1c942ad9040d00973be2c650759fbfba7e73b
parent5c9c8ac303db6f29abae6b3180a1d377d71e66fa
am 5c9c8ac3: am 5116f2fd: (-s ours) am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '5c9c8ac303db6f29abae6b3180a1d377d71e66fa':