OSDN Git Service

am 040cb642: (-s ours) am 886ac25c: (-s ours) am 449dc733: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Fri, 7 Nov 2014 15:14:45 +0000 (15:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Nov 2014 15:14:45 +0000 (15:14 +0000)
commitc443c4aafb91c0b965c64ab17e28d1363ddba1c0
tree7a87345c8d20554954ae28bd01c77ed085c66b68
parentfe8fd2b44e00e783c46922194f7172a57b25d3d1
parent040cb642e30e77879f4713ce75db169dca16e58a
am 040cb642: (-s ours) am 886ac25c: (-s ours) am 449dc733: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '040cb642e30e77879f4713ce75db169dca16e58a':
  Import translations. DO NOT MERGE