| commit | eb41b8fed7b46f5232e2ece695b96d78238fc8e7 | [log] [tgz] |
|---|---|---|
| author | Jackal Guo <jackalguo@google.com> | Wed Jan 12 05:29:59 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 12 05:29:59 2022 +0000 |
| tree | 2796130b9fe1efc0a953a33e9c15b366c3e4ad6e | |
| parent | e552f096c02fbbcd771b3b8f8562510e8eec1e39 [diff] | |
| parent | 217221964f56b470211a3b6a634a9d3f388f58d0 [diff] |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix the inconsistency of protection level" into rvc-dev am: c9fc96e7b4 am: ccb1fef85d -s ours am: 2e68486822 -s ours am: 536b639b48 -s ours am: 1f44b0ae47 -s ours am: 217221964f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16531386 Change-Id: Iab35dd309721791aa6a3b9cc7b8b842c054acde9