[automerger skipped] Merge "Add attr for nfc applications to configure support power states" am: 809b2f2459 am: 87e9535aa3 am: 73b63e3819 -s ours

Browse Source

am skip reason: Change-Id I03bd537082117e595a7badfb2d8ca6ee7cae08cf with SHA-1 ad9223f687 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd37207790f6ab84ca0e089c7fb7a17765667607

...

This commit is contained in:

Jack Yu

2021-02-03 04:31:10 +00:00

committed by Automerger Merge Worker

parent d647902ca6 73b63e3819

commit 3b35ad2fda

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