tree 395de0a45903b1535b3fc31ecc2f614e369d5fe1
parent 89a8250e242ee1d0b5b853154723b448d732b356
parent d07347eddb85fc8838071fa68c9e324eb1ae8384
author Jean-Baptiste Queru <jbq@google.com> 1375491517 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1375491517 -0700

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

* commit 'd07347eddb85fc8838071fa68c9e324eb1ae8384':
  be more robust with handling unknown sensors