diff options
author | Steven Moreland <smoreland@google.com> | 2021-05-21 17:18:27 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-21 17:18:27 +0000 |
commit | d02d9f2767d291e601a1f7a57d71c411fd9788ed (patch) | |
tree | 01c282fbe5f6f1711439cfda96b93728e8f3e936 /identity/support/src/cppbor_parse.cpp | |
parent | bad3aebaeb6cfd83a6e9656e4df99284dab7e4c7 (diff) | |
parent | e0bb84be37c5acc8ff84ad657242eca075a75726 (diff) |
Merge changes I5716db7c,Id83986fc into sc-dev
* changes:
DO NOT MERGE: Disable current matrix.
freeze compat matrix 6 for Android S
Diffstat (limited to 'identity/support/src/cppbor_parse.cpp')
0 files changed, 0 insertions, 0 deletions