commit | dcea1090b0731567ad159af078c78fa660372fbf | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Dec 21 17:48:42 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 21 17:48:42 2017 +0000 |
tree | 221205da7f02c5d78c80f9a614e6ee33d053c14a | |
parent | 935ce8d1b8467b8051bd98407413a448de320e58 [diff] | |
parent | e052b904d35bc6e810250cabdbef0b789a65c444 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 1d4e1aadbc -s ours am: e052b904d3 -s ours Change-Id: Idf106e8eb40abe1d5c4f9c299c204f5b31d8e04b