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

[automerger skipped] Merge "Enable annotations for framework stubs" am: 680906b2 -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: I1e72fe622f78933f345c6cc7473d6f59dd9b306f
parents b5781341 680906b2
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