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