commit | 9e9b4f76591304e8bc8ab9d199fd1341b22acc50 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Mon Feb 08 10:21:04 2021 -0800 |
committer | Elliott Hughes <enh@google.com> | Mon Feb 08 10:22:56 2021 -0800 |
tree | 0656dc4c5097fcc671a80a04c3556bda4e51be1d | |
parent | 72067b0fb414137ac4a6f46919d346670ffe312c [diff] | |
parent | 6a8690fc8d26c815e798c588f796eabe9d684cf0 [diff] |
Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into upstream-mas Fix METADATA and get in sync with upstream. Bug: http://b/179636234 Test: treehugger Change-Id: I832ef9ca92e0a577aeea69cb93a0d10969198b27