| commit | 7bf5e43daf1d1993a7160a76638b10bd45ac5f45 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Mar 16 21:07:40 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 16 21:07:40 2022 +0000 |
| tree | a245ca237e0d864b9f83088ab3bd70bac11fd675 | |
| parent | 37124544a84c9dc9c28b663d3a9caf7e51f5355a [diff] | |
| parent | f2cbd0e4115966f247194ce61a5d347ff160f8fb [diff] |
[automerger skipped] Merge changes from topic "revert-16712509-sc-dev-I3030c47be9d02a27505bd4775c1982a20755758c-sc-v2-dev-WCAVYOUACP" into sc-v2-dev-plus-aosp am: f2cbd0e411 -s ours am skip reason: Merged-In I3030c47be9d02a27505bd4775c1982a20755758c with SHA-1 69538cf7f3 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16713103 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17214406 Change-Id: I14d923361983ec462099f12fd986fa278c6714af