tree 54b178af66fcb57fc847a0f2432c57cbd273cc41
parent 13ba0489bf0ea149d40dd81a9713e463a4e0c20e
parent 642e5511f40f9e9d7fa18e0537f1af7858898ad9
author Peng Xu <pengxu@google.com> 1497421944 +0000
committer android-build-merger <android-build-merger@google.com> 1497421944 +0000

Merge changes from topic 'sensor_looper_crash' into oc-dev am: 638055ef41
am: 642e5511f4

Change-Id: I5c5bacff22639e8e5457cc9bfdc9ac728a76473c