commit | 965d21f56b96630fc74f7ad41dff45728a0d7741 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Aug 16 15:12:00 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 16 15:12:00 2017 +0000 |
tree | f9cf4ee471670acdbe5b7cdd4f19305359b16cf7 | |
parent | 51432796dd5714196cdaaf7c001c3bac044d973a [diff] | |
parent | a1c40c7077e6c66d56c6b91a8aea58167557a0c1 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: a1c40c7077 -s ours Change-Id: I4970cf8816ce5360b8e6340ae5774ccbd58bb4bc