commit | e25f19221f792ab983338978623de8899569228c | [log] [tgz] |
---|---|---|
author | Anton Hansson <hansson@google.com> | Wed Oct 14 15:15:49 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 14 15:15:49 2020 +0000 |
tree | 4e0b5e6e39934668c2805a4f1730b0a26c7e8b7f | |
parent | 3420af35cefb463da3fb4281bb7efdfc8a772584 [diff] | |
parent | ae26decc8ef661b5afdc47db62bdbf0bbdd1a534 [diff] |
Merge "Have test_current be a union of system and test APIs" am: ae26decc8e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1457759 Change-Id: Ie7fcc420f2a050b42b60ed2387c7552327624066