OSDN Git Service

am 41a13974: (-s ours) am 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Fri, 19 Sep 2014 23:03:12 +0000 (23:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 23:03:12 +0000 (23:03 +0000)
commit8929aeccd3772d9a4cf1a1ddbd91562952638825
treee14ec2652aed9553944fe5d3d55eeb6716201c5f
parent0a9e31f5bfd4bf4044f090b209c8fbf39356cee7
parent41a1397435ab2b20519f19a6ce07dabf540118b1
am 41a13974: (-s ours) am 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

* commit '41a1397435ab2b20519f19a6ce07dabf540118b1':
  Import translations. DO NOT MERGE