diff options
| author | 2022-04-25 19:17:38 +0000 | |
|---|---|---|
| committer | 2022-04-25 19:17:38 +0000 | |
| commit | 5589682f843c051e0d975c126d4073c28ce437ba (patch) | |
| tree | 416478550926c229e625c590a2b62ac5212aeed1 /api/api.go | |
| parent | 873280e5888615b8d35b4f580e4650ed264b98a2 (diff) | |
| parent | 58c7fa1a92cf4810fa29f87a753a78b6c40f1b7b (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 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: I595cdd8bae0081fb867a62e2bc0194072180b1d9
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