tree 9c961e63339f92837cff06875eb8430346ae2c2c
parent 3d5c831b71539f17bb8a529610953c86385dff97
parent d2a5fd0fee8a7cae2f06faaa2c8e512b70956e76
author Bill Yi <byi@google.com> 1476980467 +0000
committer android-build-merger <android-build-merger@google.com> 1476980467 +0000

Import translations. DO NOT MERGE am: 7f5b5eee99  -s ours am: 3aa778d239  -s ours
am: d2a5fd0fee  -s ours

Change-Id: If80ea8c0ed96003847c87c56105d0cada6af4e2b