[automerger skipped] Merge "Remove IllegalArgumentException for registration of capabilities" am: e51d2698ac am: b7b81db6e0 -s ours am: d678eef58e -s ours

Browse Source

am skip reason: Change-Id I3250419a2438afb58922ae653e3f2e4f9628e593 with SHA-1 ffb93e5dd6 is in history

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

Change-Id: Ia4e1bdf06aebe045f813762da2780098b93dd269

...

This commit is contained in:

Brad Ebinger

2020-06-19 19:40:57 +00:00

committed by Automerger Merge Worker

parent 00c670218a d678eef58e

commit 7001684120

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