| commit | b16594f79728e9e54d632087207741b09cb026b4 | [log] [tgz] |
|---|---|---|
| author | David Ng <dave@codeaurora.org> | Wed Dec 09 18:24:24 2015 -0800 |
| committer | David Ng <dave@codeaurora.org> | Wed Dec 09 18:24:24 2015 -0800 |
| tree | 677a80301f432d516c68dfbb6f6c9e9ad3f0fd78 | |
| parent | a3728b88c4a423946984f4b9a577f700a65ff8dd [diff] | |
| parent | 8d04aeed70e2b58b1e039875f7f3ef3594e0620f [diff] |
Merge tag 'android-6.0.1_r3' into 601r3 Android 6.0.1 release 3 * tag 'android-6.0.1_r3': Don't enable reader mode when NFC is disabled. Use global all-cpp-files-under Change-Id: I37931c4d740c6e6c9952c69fca41bbcd65cec9b7