OSDN Git Service

am 8cc98356: am 042b3ad6: am e0d9d42c: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 3 Oct 2012 15:32:19 +0000 (08:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Oct 2012 15:32:19 +0000 (08:32 -0700)
commit9489b383ebbac9c8e566497d22f5e11628dc7c8d
tree4fdb7586b3b2da0e60b2f2913ea3988718c317ec
parent42315bc0f91d3caf57b4bbd7c1f4e7ed9bcaffd4
parent8cc9835671c2b0e752bc3c87e896188bb56ae5e3
am 8cc98356: am 042b3ad6: am e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '8cc9835671c2b0e752bc3c87e896188bb56ae5e3':
  Import translations. DO NOT MERGE