tree 8166d34eda4ed1f4024860adf8bb619d7aaf4cc0
parent 14a42e560a2c704f7681e71a42a0d8c6ecd4e09b
parent f3c4c855467b66354cded9324eee6d4f60828115
author Bill Yi <byi@google.com> 1502085797 +0000
committer android-build-merger <android-build-merger@google.com> 1502085797 +0000

Import translations. DO NOT MERGE am: ae96046abc  -s ours
am: f3c4c85546  -s ours

Change-Id: Icb635833597fc7dbda954be11c8a2c5f608f86b9