tree 76f6896342772d00aa3b9ea08bc035a110d94e4e
parent d032b8ca068e160074751990cfbaf8ea1f4df9cf
parent 15ad0dacbc01761fe6c332e04020d01cd3cc8d32
author Peng Xu <pengxu@google.com> 1466653488 +0000
committer android-build-merger <android-build-merger@google.com> 1466653488 +0000

Merge \\\"Sensor: Make getId() more varied\\\" into nyc-dev am: 94b61cb340 am: 72c538707c
am: 15ad0dacbc

Change-Id: Ica9e7b68a791c13a5ccf90aff70a5f0e2c4d92b2