OSDN Git Service

am c8e13e3f: (-s ours) am a7d9bf6c: (-s ours) am 270b64e9: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Thu, 17 Oct 2013 17:23:54 +0000 (10:23 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Oct 2013 17:23:54 +0000 (10:23 -0700)
commitfa715a8023054b137eed06737e6038202d996c0b
treefe6b8cfeabb77f0249f5c5d56aa3affc9dc64f84
parentc959f0296af028e9666e0c4679adf724449d5934
parentc8e13e3f931a184071a2870f2f52a855ca177b42
am c8e13e3f: (-s ours) am a7d9bf6c: (-s ours) am 270b64e9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit 'c8e13e3f931a184071a2870f2f52a855ca177b42':
  Import translations. DO NOT MERGE