tree cbbe0133339fdfea068716ae51042eaea259fa7a
parent 37738b53d7810a6bea521310478bc137975d49d0
parent 961bddd3f8878d90f40f793b54bb16787c2dd649
author Anton Hansson <hansson@google.com> 1602693684 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602693684 +0000

Merge "Have test_current be a union of system and test APIs" am: ae26decc8e am: e25f19221f am: 961bddd3f8

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

Change-Id: I07090e61f12381964eb555bba2b5d10b2c58095c