OSDN Git Service

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: 2898f37...
authorGeoff Mendal <mendal@google.com>
Wed, 21 Jan 2015 15:08:37 +0000 (15:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Jan 2015 15:08:37 +0000 (15:08 +0000)
automerge: ea7411b  -s ours

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


Trivial merge