Skip to content
Commit ace83ac2 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Enable annotations for framework stubs" am:... 

[automerger skipped] Merge "Enable annotations for framework stubs" am: 680906b2 -s ours am: 4a1dceff -s ours am: 54a9b572 -s ours

am skip reason: Change-Id I4fc66d607276ff885947489afd63e1370ec85939 with SHA-1 01ff6b24 is in history

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

Change-Id: I7243638eb8dcb3c7176841c14cd2bc2f506396cc
parents 8d0165a3 54a9b572
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