commit | 6e96950a3701a2c8cb4128ea446b7ced9bd6d0f5 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Jun 12 21:30:08 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 12 21:30:08 2017 +0000 |
tree | 91612589483dba25c52ced558442a34394b10ab4 | |
parent | 1072b62b150dd20fec2f6fdb2fabcd21db87519e [diff] | |
parent | fe84caad611ce7f672919e13e6f01e136eab5d69 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: fe84caad61 -s ours Change-Id: Ia5bf5f5b4f2534adf8ea60557494263f1eaef51b