commit | 02e0f5c69fcc8ca41e0c566e045a9e3c9ea21eac | [log] [tgz] |
---|---|---|
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Tue Mar 14 17:47:39 2023 +0000 |
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Tue Mar 14 17:47:39 2023 +0000 |
tree | 1983c9e718027ea6c6157fc61d9f68b0dec77929 | |
parent | fad87822b5f744dbca7ea4855da3dfe96a794b17 [diff] | |
parent | 1f3fb439a6874b6706155f12479c7a6557f53445 [diff] |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21408331', 'googleplex-android-review.googlesource.com/21987133'] into sparse-9719927-L31500000959114895. SPARSE_CHANGE: Iddb8619be7bdd9767211e44913e8ba3871bc6580 SPARSE_CHANGE: Ifa80de5b64d98240119ffb0cd01769afdcd14076 Change-Id: I4ecf867cb69f39e8c4087afc0b87f8d721b1e6e3