commit | 24c9d3924a369f53ab46b0879ef4774c7ac3c864 | [log] [tgz] |
---|---|---|
author | Jeff DeCew <jeffdq@google.com> | Fri Sep 10 15:58:41 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 10 15:58:41 2021 +0000 |
tree | d23061ed19e9e1842d5dd3c84ff341fa5dd147cc | |
parent | f8e8e36f93f0b389b97ba7d7d71f206cb2d24a36 [diff] | |
parent | 14932fc95a46a5d893e0b2c97fa33a6eccdf819c [diff] |
Merge changes I0fc3b7ae,I712e6d6b into sc-qpr1-dev am: 2f0616bd79 am: 14932fc95a Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15795789 Change-Id: I9955a4e7e1403e547058c8978cba33da7b554ec9