OSDN Git Service

am f1ba6eb9: (-s ours) am 36648e50: am 32aa7da8: (-s ours) Merge "Import translations...
authorBaligh Uddin <baligh@google.com>
Wed, 1 May 2013 20:57:59 +0000 (13:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 May 2013 20:57:59 +0000 (13:57 -0700)
commit2c49444ec05ab76721b05bea47f71773f535627f
tree308909ce392a29ae96069198817fa1f230ca35b4
parente34bf72a32602bed181fd7f0db49df7b99e7cb17
parentf1ba6eb9a062967ae5110b2abd61967bce211b80
am f1ba6eb9: (-s ours) am 36648e50: am 32aa7da8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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