| commit | ab09038cd338c46be577bb3df8f0b187cf48bdce | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Wed Oct 14 17:00:03 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 14 17:00:03 2020 +0000 |
| tree | 120437aed783e19d08207e8c3d2a5211c6185371 | |
| parent | 9f1a46639b2a15d2213490e4d3e577a03b9a5194 [diff] | |
| parent | b7b1fb544f20c0c3a1663985aaef084eeb33ca27 [diff] |
[automerger skipped] Merge "Have test_current be a union of system and test APIs" am: ae26decc8e am: e25f19221f am: 961bddd3f8 am: b7b1fb544f -s ours am skip reason: Change-Id I23d3c88624ee7599485c3390a0440b78bc18a0a2 with SHA-1 a2b349773a is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1457759 Change-Id: Ib31c2a7e864402389182fbd9e690b31f32be8f70