OSDN Git Service

am 383d2ab6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
authorGeoff Mendal <mendal@google.com>
Mon, 17 Nov 2014 22:59:04 +0000 (22:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Nov 2014 22:59:04 +0000 (22:59 +0000)
commitf17620e3d60e63425bdf3d14ce35116f6981c5b6
tree1b7ada99965f9fd34a6f53f6401b004c4f0fe7fc
parent6c30eb976a32d21cd65a0281f24544a609657594
parent383d2ab6bd9a0e3755a40a3b0b98e939cc017a6c
am 383d2ab6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '383d2ab6bd9a0e3755a40a3b0b98e939cc017a6c':
  Import translations. DO NOT MERGE