| commit | bc720a77e8c6657ecc5cfb8bc416633b93039f87 | [log] [tgz] |
|---|---|---|
| author | Pablo Gamito <pablogamito@google.com> | Mon Sep 27 11:30:54 2021 +0200 |
| committer | Pablo Gamito <pablogamito@google.com> | Mon Sep 27 13:51:34 2021 +0000 |
| tree | 3bbcdb02482030b6008ad058ee803905d9a8cf19 | |
| parent | 4650065c80afd7e57c7fda6d8d65645385ed83bd [diff] | |
| parent | 44e5c9a0f5ba24dfc5ae54ae25a9c6d3e6e0ae22 [diff] |
Merge changes I037517d9,Ic603b271,I47fe530f into sc-qpr1-dev am: 44e5c9a0f5 Resolves merge conflict manually Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15836432 Bug: 201126018 Change-Id: I91e61c53bafff7f32be7c2fd3790f02d23875446 Merged-In: Ic603b2711c19299f01271131062765255451310a