OSDN Git Service

am a7d9bf6c: (-s ours) am 270b64e9: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Thu, 17 Oct 2013 17:21:50 +0000 (10:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Oct 2013 17:21:50 +0000 (10:21 -0700)
commitc8e13e3f931a184071a2870f2f52a855ca177b42
tree6cbbf02a94c9e24ed979c17cd05ef31d87eedd15
parent88b7b0075b96d35c2aa7ad2aa3ea53480246ebe4
parenta7d9bf6cac9f8fa82aee368d2a3db8713b79cdea
am a7d9bf6c: (-s ours) am 270b64e9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

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