tree 5e48078ca216b710bf703ae962ea6ac29a7da6a3
parent 18c24f350f62f50a7ae8c429bc7ed27c3b1aeccb
parent 079c69e4b5415986e436267be535f22ea2b632da
author Josh Tsuji <tsuji@google.com> 1637092633 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637092633 +0000

Merge changes I93374f42,I0a1ae320 into sc-v2-dev am: 079c69e4b5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222609

Change-Id: I05a29021c92b9df2f99a3759773a5d6c5f51b279