OSDN Git Service

Merge \\"Sensor: Make getId() more varied\\" into nyc-dev am: 94b61cb340
authorGreg Kaiser <gkaiser@google.com>
Thu, 23 Jun 2016 03:41:01 +0000 (03:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 23 Jun 2016 03:41:01 +0000 (03:41 +0000)
am: 0ad55d5769

Change-Id: I5940a4b20b9d4be040a20679d2115c3c7fab5fb2


Trivial merge