OSDN Git Service

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

* commit 'a6b039ac51b195e8c4e0ebc152741d61c6ce1c6b':