tree 8bdc9e5eedefcfb44ee6e87c13faf300a3512016
parent 1c2280dea02b0dbbbc44b4bd50d98dd9fbbd0a9a
parent e430622a4fffc0060d6ac9a3311d2b99fe30cc2c
author Bill Yi <byi@google.com> 1470420570 +0000
committer android-build-merger <android-build-merger@google.com> 1470420570 +0000

Import translations. DO NOT MERGE am: 8bc8d4d4f7  -s ours am: 8fdb88e42b  -s ours am: 3d376a2be0  -s ours am: 831cbc7d53  -s ours
am: e430622a4f  -s ours

Change-Id: I90460ed85f31c3fa3815e1c0d29406239ecfe75e