OSDN Git Service

am eb5b7721: (-s ours) am e2182449: (-s ours) am 3f5fd1fe: (-s ours) Merge "Import...
authorGeoff Mendal <mendal@google.com>
Fri, 5 Dec 2014 00:14:20 +0000 (00:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Dec 2014 00:14:20 +0000 (00:14 +0000)
commit94eb04617fdb73d74c5f1751f674762e6657dc03
treeba4620e019c0187330c41f1cf7b83b4d80bdc6b9
parent0c8a2d63be1192e4b67297ca592e815b0abd9746
parenteb5b7721df47a601d3707a7bcbf32d61efe09c5b
am eb5b7721: (-s ours) am e2182449: (-s ours) am 3f5fd1fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit 'eb5b7721df47a601d3707a7bcbf32d61efe09c5b':
  Import translations. DO NOT MERGE