[automerger skipped] Merge changes from topics "ApiReview_DEVICE_NR_CAPABILITY", "getPhoneCapability" am: 8c19236f8f am: 2df532c092 -s ours am: e808512ed7 -s ours

Browse Source

am skip reason: Merged-In Ia394537ec57900a410b283ddffdcead017e6d9c6 with SHA-1 833271753e is already in history

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

Change-Id: I60688464d5d9eef3ba897e92e3a39b574a00af5a

...

This commit is contained in:

SongFerng Wang

2021-07-22 18:34:32 +00:00

committed by Automerger Merge Worker

parent 1565420f0e e808512ed7

commit 058d8a3116

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