OSDN Git Service

am 95d4d6bc: (-s ours) am f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Thu, 11 Sep 2014 16:12:35 +0000 (16:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Sep 2014 16:12:35 +0000 (16:12 +0000)
commitcab39e0ac32583367e916380d3170c4fb4187d4d
treec789c09af06ed9e8a6601a09f71c88fbf430fb1a
parent96c2fe9d2cde671442b5aa5e6fbc87e4ec9bd108
parent95d4d6bc9b095ef61930ceaf7b9c0a8107b4112d
am 95d4d6bc: (-s ours) am f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

* commit '95d4d6bc9b095ef61930ceaf7b9c0a8107b4112d':
  Import translations. DO NOT MERGE