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

[automerger skipped] Merge "Have test_current be a union of system and test... 

[automerger skipped] Merge "Have test_current be a union of system and test APIs" am: ae26decc am: e25f1922 am: 961bddd3 am: b7b1fb54 -s ours

am skip reason: Change-Id I23d3c88624ee7599485c3390a0440b78bc18a0a2 with SHA-1 a2b34977 is in history

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

Change-Id: Ib31c2a7e864402389182fbd9e690b31f32be8f70
parents 9f1a4663 b7b1fb54
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