[automerger skipped] Merge "Enable @TestApi access for instrumentation." am: f1d5754c10 am: e0ef4a9aab am: 7c54084978 -s ours

Browse Source

am skip reason: Change-Id I8dd3bbacdb263a3e30539f43d8081f6d78e80155 with SHA-1 6609105eb5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a6de6d964b892f492ee70998b09ab6eb9cef326

...

This commit is contained in:

satayev

2021-01-21 15:59:13 +00:00

committed by Automerger Merge Worker

parent 0a5c88486a 7c54084978

commit 15f17656fd

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available