OSDN Git Service

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

* commit '36648e508e8241757a1798e79d18d5a9abeccc45':
  Import translations. DO NOT MERGE