| commit | a8bcc4b5062dc8d0402f7a08929c51c1fd34f06e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Dec 21 07:36:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 21 07:36:36 2021 +0000 |
| tree | b0bd07a2ca8ad6600bfe6dcb8121073644cbaeb0 | |
| parent | 499790f0247b90ab06e3e1f168f0c2e0e476c22c [diff] | |
| parent | 9fda6e53faeeceaf061710b4964e0f348e05b4f4 [diff] |
[automerger skipped] Merge "Merge SP1A.211205.008" am: a201cdea9c am: 6d6f626a41 -s ours am: 9fda6e53fa -s ours am skip reason: Merged-In Id5cd4123f1bb7bdd85e564fc6997dfbc50652a5f with SHA-1 11dd6452d6 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1930664 Change-Id: Ie3a7cf937ae2c71d5d253e15bc84e7032a8df5a7