tree a97f6791a19bf19afb57d2a470002a34a6f57b54
parent 15ad0dacbc01761fe6c332e04020d01cd3cc8d32
parent 0ad55d5769da828c62d1a0a75f84f5cb9872b0ff
author Greg Kaiser <gkaiser@google.com> 1466653261 +0000
committer android-build-merger <android-build-merger@google.com> 1466653261 +0000

Merge \\"Sensor: Make getId() more varied\\" into nyc-dev am: 94b61cb340
am: 0ad55d5769

Change-Id: I5940a4b20b9d4be040a20679d2115c3c7fab5fb2