OSDN Git Service

Merge "Import translations. DO NOT MERGE" into lmp-dev
authorGeoff Mendal <mendal@google.com>
Mon, 20 Oct 2014 13:58:44 +0000 (13:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 20 Oct 2014 13:58:44 +0000 (13:58 +0000)
commitd1311fbf382c72abd140ebe5356cddfb046ee451
treea38541d0af4c5fae4e89875466497026bc9388aa
parentd159e0353c1f96ba25b91c18c7e48e95d05e111c
parentbae5d85a773af7c40578160ca4ba4261de0c68c5
Merge "Import translations. DO NOT MERGE" into lmp-dev
automerge: bae5d85  -s ours

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