OSDN Git Service

Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am: 44360bc96a...
authorZhaoyu Su <zhaoyu.xa.su@sony.com>
Thu, 9 Aug 2018 23:44:57 +0000 (16:44 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Aug 2018 23:44:57 +0000 (16:44 -0700)
commitd8ba38975be73bd59987b4b3a6965f3cdf920246
treeb1f99d6904fcdb738236822cb0b69d687898a602
parentb3ad03f0baf9c8d7c7f0516cce865a7f936b9fb4
parent2c23e6ab750fb32a2258aebc8b4b249f1ff4efa7
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am: 44360bc96a am: b69559f882
am: 2c23e6ab75

Change-Id: I99bb280fd1697d890a6f44cc8cb49e0eaadef325