tree 2fd763f7e98c92ffb39f12df06afc00a04e30c9c
parent 8f7a7e01938a1649b49741abcaf93072c441a7fa
parent 8ff73b596e7c59f32a3f0df503ae8a9e5adbced5
author Daniel Estrada Alva <destradaa@google.com> 1440610635 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440610635 +0000

am 8ff73b59: Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev

* commit '8ff73b596e7c59f32a3f0df503ae8a9e5adbced5':
  Cherry-pick: Add callback-based support for HW Activity Recognition.