OSDN Git Service

am 526bcbb1: (-s ours) am b0cf2dcd: am 20b837a9: am f9ee06b2: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Fri, 5 Apr 2013 19:15:54 +0000 (12:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Apr 2013 19:15:54 +0000 (12:15 -0700)
commit2db67af7ec8e19b081fd4e142b5194d4b695e44c
tree5032fdf45e5929a3350f4bd473c06c7429d801e2
parent8774bd1c22a45ded8f6f2a6a67f1967ca38fe910
parent526bcbb1699dc08962e39aeee2129a085c1c028a
am 526bcbb1: (-s ours) am b0cf2dcd: am 20b837a9: am f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '526bcbb1699dc08962e39aeee2129a085c1c028a':
  Import translations. DO NOT MERGE