tree 9e4dd96467a67669dacfc5fe48b19dd6fd8c0d0a
parent edce0f277b69665b99c1ea0ee7f1aeeab27e78b8
parent 2413b5226f09c338b92aa8a6c63cdf2ad5d87182
author Bill Yi <byi@google.com> 1497340368 +0000
committer android-build-merger <android-build-merger@google.com> 1497340368 +0000

Import translations. DO NOT MERGE
am: 2413b5226f  -s ours

Change-Id: I645b3f00f391cb485a3c0d46b92a578b4ac79eef