Merge "[automerger skipped] Merge "HealthServiceWrapperAidl fix NPE" am: aa3c079d2a am: 56602664f2 -s ours" into tm-dev-plus-aosp am: 82d1e32454 -s ours am: 375e2a0e1d -s ours

Browse Source

am skip reason: Merged-In I45c4ebca8c5612fdfbab8ffd28b9c2799d74869a with SHA-1 30f2c7820c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115401

Change-Id: I7aac5a8afebcdc6256414da29358f9e6a66d3c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Automerger Merge Worker

2022-06-04 01:43:10 +00:00

parent 3089cfb241 375e2a0e1d

commit 56f4b546e2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available