tree 7b16fd125020780436501a9687fae0c7df613f7b
parent ffd768ee8ed936a2efb5ecec188957369b3c661a
parent 90cfa629cf9ef2c13942b0f0ca0faa0568130214
author Bill Yi <byi@google.com> 1473250765 +0000
committer android-build-merger <android-build-merger@google.com> 1473250765 +0000

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

Change-Id: I8d71e07e06e8ae7b4cd5914786c2d61577f14e52