OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 55bc169d50 -s ours am...
authorGeoff Mendal <mendal@google.com>
Wed, 21 Oct 2015 17:40:46 +0000 (17:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Oct 2015 17:40:46 +0000 (17:40 +0000)
commit08c49315ebc3c9ca4ea29f18c62eb7def584f617
treedc77f53e5b185a9b4b3cf5f35dbac281c754f200
parentdf21f6bbc0f48ace2dabddcb13d0a3c96dce0694
parent1ae2460a578d7850874d602d89ef55ab0f6a3073
Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 55bc169d50  -s ours am: 7829bc5ad4  -s ours
am: 1ae2460a57  -s ours

* commit '1ae2460a578d7850874d602d89ef55ab0f6a3073':