Skip to content
Commit aab189a7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "devicepolicy: use typed List<String> in AIDL" am:... 

[automerger skipped] Merge "devicepolicy: use typed List<String> in AIDL" am: c2cbf5d4 -s ours am: e5fc82b0 -s ours am: dea84c87 -s ours am: a73a545f -s ours am: 7cc27944 -s ours

am skip reason: Merged-In I0ea1c35f7ce4dd6f6bde02874e02ed190fa2e904 with SHA-1 07db6330 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1801773

Change-Id: Ifb51b5b41744445bda12a550d64e47933e974bd8
parents 3cd81c16 7cc27944
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment