summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Martijn Coenen <maco@google.com> 2017-04-13 16:53:18 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-04-13 16:53:22 +0000
commite7def4e9e03cec30a784b51f784dbf7326dc0f77 (patch)
tree4a1e0e0ae0110f1a0f5aa9ea62aef55f8495155a /libs/gui/ConsumerBase.cpp
parentdc87165eb58d7f0229331ffa18c097cf84b1923e (diff)
parente18608d04732f1b1a6c3cd5a344520b870b3a5da (diff)
Merge "Add android.hardware.nfc.any to NFC features." into oc-dev
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
0 files changed, 0 insertions, 0 deletions