tree ca9386da9b9df041e62964cbfed6adab7956cbd2
parent e622edebfb980e9697977fe5bd32cbef08297a7a
parent 14d2548ab76fa60c0547abdadb26cd27c295fd7c
author Narayan Kamath <narayan@google.com> 1438166841 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438166841 +0000

am 14d2548a: am 65f1d44c: am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev

* commit '14d2548ab76fa60c0547abdadb26cd27c295fd7c':
  Revert "Bug fix in SensorManager."