tree 2a25457c4f18d492f7bf36084621771f92f9ce7b
parent 710f3e2cc6bc2cdc2f2cddb2190823ea31efd52a
parent 83485dc920cdc4a6f3dd6797623f536c99f08a6c
author Jean-Baptiste Queru <jbq@google.com> 1375490519 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1375490519 -0700

am 83485dc9: Merge "be more robust with handling unknown sensors"

* commit '83485dc920cdc4a6f3dd6797623f536c99f08a6c':
  be more robust with handling unknown sensors