commit | aeb1aa8e6b3ca65d90144bd8477069abc7b670ab | [log] [tgz] |
---|---|---|
author | Evan Severson <evanseverson@google.com> | Thu Jul 08 22:06:47 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 08 22:06:47 2021 +0000 |
tree | e8d796698b63b9317a4ce16e362cea0242a20261 | |
parent | 33edb79a3048656829fe78da40a488724e88136d [diff] | |
parent | f701c8d1d8ee3fbe81734c08b3402292f2d00629 [diff] |
Merge changes If8da2ae5,I38445a13 into sc-dev am: f701c8d1d8 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15224092 Change-Id: Id2263544ce765b418fbb9c26296ed6c0febe0f23