tree e97bb508527fabbf53e2615ff29b797d00bc29a9
parent 2a8ae4ef70f2a3e0239a4df9bf33b4ff141594fe
parent deb71b2812702318900c36b7bcfa9759525ea7cc
author Aravind Akella <aakella@google.com> 1411952177 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411952177 +0000

am deb71b28: Merge "Fix a possible SensorService deadlock." into lmp-dev

* commit 'deb71b2812702318900c36b7bcfa9759525ea7cc':
  Fix a possible SensorService deadlock.