| commit | d911b1dd0d9770137ff041f38d35976dedb9f12b | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Aug 18 00:24:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 18 00:24:22 2021 +0000 |
| tree | f9a53d6a0137d05c0c68decf49697d5d247fe2a3 | |
| parent | 791c416170267aa560a65dad0e57baaa6ff819c7 [diff] | |
| parent | 12885184b0bd1508d55a82cd582843774de366c9 [diff] |
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: dca6f1794e -s ours am: 230c151604 -s ours am: fcfd1b8a2b -s ours am: 12885184b0 -s ours am skip reason: Merged-In If1c0f208f6b5c0d8b34c37bcfb9d1d14d890fde2 with SHA-1 523328f63d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/15571654 Change-Id: I2825d125b30db31cc235188d5a35fef800a5f889