diff options
| author | Steven Moreland <smoreland@google.com> | 2021-05-21 00:34:09 +0000 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2021-05-21 00:34:09 +0000 |
| commit | e0bb84be37c5acc8ff84ad657242eca075a75726 (patch) | |
| tree | fd151a5e329e501dbbdb2e05e6f9bda35fd921bf /identity/support/src/cppbor_parse.cpp | |
| parent | 86a518cfa64fdc85ab349701e79f8adf7efdacd2 (diff) | |
DO NOT MERGE: Disable current matrix.
The current matrix should not be used in Android S. However, it is left
here so that any late fixes to the S matrix can be made in a way that
will flow downstream.
Reason for 'DO NOT MERGE' - avoid landing this change in goog/master,
since the current matrix has HALs added there, some devices may be
relying on it.
In order to allow the (AOSP subset of) the S manifest to be frozen in
AOSP, and the current matrix to be enabled from aosp/master -..->
goog/master, this will be reverted in sc-dev-plus-aosp immediately after
it merges.
Bug: 178221726
Test: boot devices and vts_treble_vintf_vendor_test passes
Change-Id: I5716db7cfd629527dd33daac94244e5df41520f5
Diffstat (limited to 'identity/support/src/cppbor_parse.cpp')
0 files changed, 0 insertions, 0 deletions