commit | 961bddd3f8878d90f40f793b54bb16787c2dd649 | [log] [tgz] |
---|---|---|
author | Anton Hansson <hansson@google.com> | Wed Oct 14 16:19:55 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 14 16:19:55 2020 +0000 |
tree | f06f714723fe5c8c0890a71af008d75ca87ef9f4 | |
parent | f2c0479945a609d161824fc021fe0118c4841cef [diff] | |
parent | e25f19221f792ab983338978623de8899569228c [diff] |
Merge "Have test_current be a union of system and test APIs" am: ae26decc8e am: e25f19221f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1457759 Change-Id: If85e19bdb4878bbedfa5828a9c73255ec19b5e5d