tree 6b7d557ed6856cf8c48d3a4ad831325c1a882325
parent 937159f8d624e06ad008fa92847c1a97ef8a7b7a
parent 2ad768acc0d5e7902f1a0c3f88851911c222a458
author Bill Yi <byi@google.com> 1505594169 +0000
committer android-build-merger <android-build-merger@google.com> 1505594169 +0000

Import translations. DO NOT MERGE
am: 2ad768acc0  -s ours

Change-Id: I6786e74f9f7125836484d1852ac4410c33a80cf0