tree 79b626ec84a118fbd03c284a1a587cc7dc944f1f
parent 9cf9d294efddf02511ec8395435e3bb1e1a20e94
parent 581a166ae161afb836115989071c97b63c41303a
author Bill Yi <byi@google.com> 1501109760 +0000
committer android-build-merger <android-build-merger@google.com> 1501109760 +0000

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 581a166ae1  -s ours

Change-Id: If1bba4f6237b39c86fc5fa998376683d78cd483e