| commit | 37979346afcc56d24508a94a68f86ff693690a64 | [log] [tgz] |
|---|---|---|
| author | David Ng <dave@codeaurora.org> | Wed Dec 09 18:13:33 2015 -0800 |
| committer | David Ng <dave@codeaurora.org> | Wed Dec 09 18:13:33 2015 -0800 |
| tree | 03bc84ff65dd98019efd11a69c45f62ec384db67 | |
| parent | 0abaf1e5705c7084d3d425bbf117f33d65f66f7c [diff] | |
| parent | 1ce7fe6b0a887edc6fad8e3386ab8e28a5f0d107 [diff] |
Merge tag 'android-6.0.1_r3' into 601r3 Android 6.0.1 release 3 * tag 'android-6.0.1_r3': Do not reset out_get_presentation_position() to 0 on standby Fix DATA_INJECTION flag in sensors.h Conflicts: include/hardware/sensors.h Change-Id: I5934eafcc58da2bb93e725b3db153bb3e31970f4