| commit | f5b867d3f1fcc4bed74f8c8f2bb9be2dc770719b | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Tue Sep 08 13:39:54 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 08 13:39:54 2020 +0000 |
| tree | 1eabada062868037143592740db0dc16f82f070e | |
| parent | 5febf61a72571eb029c61a719f42666be060409a [diff] | |
| parent | 3e20672380e389ce324eee08ea6a1c6288b99868 [diff] |
Merge the framework-defaults into framework-minus-apex am: 3e20672380 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12534238 Change-Id: Iaae1ddc15cf3162fcd051f3682f43c80ae64f325