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

[automerger skipped] Have test_current be a union of system and test APIs am: b7a4938c -s ours 

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

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

Change-Id: I9e61df3e485f622b514782930afccc99b8c4a863
parents ee955599 b7a4938c
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