tree 0ba1df7816fc3c37449c2835debf92b723e5190f
parent c1edefc0590136e5ff46d634621d8f69d40f8053
parent 120c3e9874c8b410def834037aec7d98c50d05d5
author Bill Yi <byi@google.com> 1501108655 +0000
committer android-build-merger <android-build-merger@google.com> 1501108655 +0000

Import translations. DO NOT MERGE am: 495d4ce1b9  -s ours
am: 120c3e9874  -s ours

Change-Id: I149d23fe5cdedb0ecb813d252277e15e75055c01