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

[automerger skipped] Merge "usb: Implement the AIDL in framework" am:... 

[automerger skipped] Merge "usb: Implement the AIDL in framework" am: 1a0ad60b am: ea87ce19 am: 0a87226a -s ours

am skip reason: Merged-In I6d9bc861a4aceb753bf6f816daccd039e423994d with SHA-1 74272e24 is already in history

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



Change-Id: I1ed8696cc0c7984366eea1e6e1768ec99618da95
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 303b013a 0a87226a
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