| commit | bbad134bf2c9cd508c3461cc36e8afbe3a4e0a02 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 14 22:20:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 22:20:15 2020 +0000 |
| tree | d19189f1aed7694e092a8ba3fc39b9aa1181f16d | |
| parent | 0afde7ad0f7abd6d69a12146713711b3cfb3e549 [diff] | |
| parent | c95098a843fdf1b01f7d0ce56f47a628e622a691 [diff] |
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 2bcf2aad9f -s ours am: cf2a8c6ead -s ours am: c95098a843 -s ours am skip reason: Change-Id I7ef0979ffed7d218de1e68c428c97cedea180059 with SHA-1 0c047bdf22 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12579276 Change-Id: If3d805938e66b94724826055ef420568d5061a7d