diff options
| author | 2022-04-25 19:56:29 +0000 | |
|---|---|---|
| committer | 2022-04-25 19:56:29 +0000 | |
| commit | 382e2b6a55c5381f3b120e44da0e9b5bb90e726a (patch) | |
| tree | c16d56ba0aae23d07421aca4edf883356949bc82 /api/api.go | |
| parent | 32cee82670e44a1cec6cb7eb240a6603c8d7ea21 (diff) | |
| parent | 5589682f843c051e0d975c126d4073c28ce437ba (diff) | |
[automerger skipped] Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254f7 am: c601e32e9e -s ours am: 8d8f4691df -s ours am: 58c7fa1a92 -s ours am: 5589682f84 -s ours
am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 0762961674 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452585
Change-Id: I6682298241e3414f89403cc2d058b90821ee8aca
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'api/api.go')
0 files changed, 0 insertions, 0 deletions