| commit | dbe5c0cd5198a654c69f14dee7664bffa6e1f0a0 | [log] [tgz] |
|---|---|---|
| author | Zhaoyu Su <zhaoyu.xa.su@sony.com> | Thu Aug 09 16:59:12 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 09 16:59:12 2018 -0700 |
| tree | c8d5c41b9d64a9e88885c201bb2b9b93b5e37464 | |
| parent | 112301bc832c0e2c140704678f679e0eb93e5387 [diff] | |
| parent | d8ba38975be73bd59987b4b3a6965f3cdf920246 [diff] |
Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference" am: 44360bc96a am: b69559f882 am: 2c23e6ab75 am: d8ba38975b Change-Id: I699ec762b84fcfe47acf7a98bd7cc4803c9fb9cb