Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 319b4fed authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-ee1ee9bbaaae4ad48d4a7c3b5a5610d8" into rvc-d1-dev-plus-aosp

* changes:
  [automerger skipped] NIAP: Try to compute data if use keystore function fail am: 5d1188ed -s ours am: dc8237be -s ours
  [automerger skipped] NIAP: implement bluetooth keystore interface.(1/2) am: 449b87b8 -s ours am: df51d891 -s ours
  [automerger skipped] NIAP: Add new argument to determine config checksum check result.(1/4) am: ebc4b1ed -s ours am: 0601e18d -s ours
  [automerger skipped] NIAP: Implement BluetoothKeystore feature am: f635699e -s ours am: 03c33b43 -s ours
parents f4f657ad 825cbce0
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment