| commit | cab292d695a0e1b0f935e218bb0461c9215f899b | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue Apr 27 02:40:06 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 27 02:40:06 2021 +0000 |
| tree | aad3371f71d5b76eb66f6d3a621c5a5629df54ee | |
| parent | 6a34a736abbf31d90dc527420f6aa76a874c6709 [diff] | |
| parent | 1488a15856a20ab3c0df3ecab1a14a8c4afc30d8 [diff] |
Merge changes I292b8e32,I689d0838 am: 1488a15856 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1686989 Change-Id: I1b8a7d2e0105a32a2aba6d0e16a21f90f5ec12db