tree 73722fd9d615c99c5a116a2cfa3677587ec74cdf
parent 9a2f2ef14f6655cb4f71edca2553bbad3cc62795
parent 1ce7fe6b0a887edc6fad8e3386ab8e28a5f0d107
author Aravind Akella <aakella@google.com> 1444856892 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444856892 +0000

am 1ce7fe6b: Merge "Fix DATA_INJECTION flag in sensors.h" into mnc-dr-dev

* commit '1ce7fe6b0a887edc6fad8e3386ab8e28a5f0d107':
  Fix DATA_INJECTION flag in sensors.h