tree 80d99db6ba14b02abb8ed4edb04dc7320f3ecf59
parent 274d92c6a39fe67c2995f11764dcf50685f111e9
parent 87e9535aa3088c579c1901c87665ef89dab93e06
author Jack Yu <jackcwyu@google.com> 1612323105 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612323105 +0000

Merge "Add attr for nfc applications to configure support power states" am: 809b2f2459 am: 87e9535aa3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5eaefb99522965e3f776868be11bb663712f6deb