OSDN Git Service

am 75c57fda: (-s ours) am 565eece8: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Thu, 17 Oct 2013 17:21:51 +0000 (10:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Oct 2013 17:21:51 +0000 (10:21 -0700)
commit7f8dd303e49c1c99e3e3d085f1b1bbd10a1bc9b1
treec05cb0bb5b3d71a1312de35aee4043cf6e113fe5
parentb8f36242a11f6323e957bcd1b7c6b849c9573b59
parent75c57fda5d9f5631e112460591bd6b3e6502a276
am 75c57fda: (-s ours) am 565eece8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '75c57fda5d9f5631e112460591bd6b3e6502a276':
  Import translations. DO NOT MERGE