OSDN Git Service

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

Change-Id: Ied341984f903d341544be1bb0bf212a6ca34e059


Trivial merge