OSDN Git Service

am 359f2552: (-s ours) am 44c02874: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Tue, 10 Sep 2013 14:53:23 +0000 (07:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 10 Sep 2013 14:53:23 +0000 (07:53 -0700)
commitb9cbdd9c55c75160d03a18d05a21dcb87d4e58ff
tree0064548d0017b58839aeab2d84c080f5237d9ee1
parent21fb09d385d6fb5cbc4d3d3194f2cb3fbee4913b
parent359f2552d54da59f9cd04862d9159a627fb7852b
am 359f2552: (-s ours) am 44c02874: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '359f2552d54da59f9cd04862d9159a627fb7852b':
  Import translations. DO NOT MERGE