OSDN Git Service

am 8d20a142: (-s ours) am 0cc98a35: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Fri, 1 Mar 2013 19:18:07 +0000 (19:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 1 Mar 2013 19:18:07 +0000 (19:18 +0000)
commit33e4f0c479cf8719d9dd477aa99ce210104e634a
tree0164ca3883db9a7f355ef3a75f0d46b050f8066a
parent41d69276d1ba1cbf086d4d8259c49684ffaac7f7
parent8d20a142761ce42a428a9c7b37c15348aebcab0e
am 8d20a142: (-s ours) am 0cc98a35: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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