| commit | c8ed8dce5956ac525048eab486a5d26f1a14dc5f | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Mon Mar 22 03:55:23 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 22 03:55:23 2021 +0000 |
| tree | 341aea973b5c00df6ecdff3e3a5baa38a15f4752 | |
| parent | 7d909af3bbdfe688bc8f30d8b44ca1ecf73d9378 [diff] | |
| parent | 39ff19da2f56ceb51b485158edc092194daf12d9 [diff] |
resolve merge conflicts of d2c4f1d6c85ef453abf06a03dbc08ebe293f2412 to stage-aosp-master am: 39ff19da2f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13944446 Change-Id: Ia4f30adab268c9c51d89d61355a48da00b855190