| commit | d8ba38975be73bd59987b4b3a6965f3cdf920246 | [log] [tgz] |
|---|---|---|
| author | Zhaoyu Su <zhaoyu.xa.su@sony.com> | Thu Aug 09 16:44:57 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 09 16:44:57 2018 -0700 |
| tree | b1f99d6904fcdb738236822cb0b69d687898a602 | |
| parent | b3ad03f0baf9c8d7c7f0516cce865a7f936b9fb4 [diff] | |
| parent | 2c23e6ab750fb32a2258aebc8b4b249f1ff4efa7 [diff] |
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am: 44360bc96a am: b69559f882 am: 2c23e6ab75 Change-Id: I99bb280fd1697d890a6f44cc8cb49e0eaadef325