OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Mon, 25 Apr 2016 12:54:27 +0000 (12:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 12:54:27 +0000 (12:54 +0000)
commitad145e503eee7aba6d61923b39b39c343021a737
treeae1e4bfbd72f30f24e352540ff490bafc4663d52
parented6bdaaf380939779bb06dc51af88098c3c3aac1
parent90edb46d017f793401f65c64368a7a4cf6f881f9
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 90edb46  -s ours

* commit '90edb46d017f793401f65c64368a7a4cf6f881f9':
  Import translations. DO NOT MERGE

Change-Id: I01ff764d1309b22b4bcb0fb9512a314aee9587ab