tree c5fa94fc25bcbb328d4207e8339113738571b0ab
parent b79a92155cc5a261ebaef2ca62c14121a62557db
parent 2819360abdbdfce844424188807cfa9dc08d633a
author Bill Yi <byi@google.com> 1522705388 +0000
committer android-build-merger <android-build-merger@google.com> 1522705388 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 915d04b422  -s ours
am: 2819360abd  -s ours

Change-Id: Iff447d49f0e1d9ff89904b08ee3bd76cf7b62cb5