commit | 42c2cbf5c390f2fdf30b52aeaebdaf4aed453158 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Dec 08 17:22:52 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 08 17:22:52 2016 +0000 |
tree | b433d1c18a264fd5bd574f2d008797993077738d | |
parent | ec973865578ee2772323143313845ecfe3d6b03a [diff] | |
parent | f7a5a3b0cea0b89ce82f1e2526bd20298c18fbef [diff] |
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 3c54cdf15e -s ours am: f7a5a3b0ce -s ours Change-Id: Id10ecb75e1fe67ff44ef1e27ed1f18eb326c353d