tree c8995d1278fe61742629309dff657d090b0a120a
parent 02e99e272dbfedf5d9ba1ae91fa2b83cab5b3d07
parent 419b17ec9e8520b8d38b3f8db6d6fe5b0fce1211
author Ricardo Cervera <rcervera@google.com> 1395433453 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395433453 +0000

am 419b17ec: am 1d77a874: am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs

* commit '419b17ec9e8520b8d38b3f8db6d6fe5b0fce1211':
  docs: Added new sensor types. Bug: 10674725