OSDN Git Service

Merge "Add android.hardware.consumerir@1.0 service." am: 3bee82f5d7
authorConnor O'Brien <connoro@google.com>
Tue, 13 Dec 2016 21:08:30 +0000 (21:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Dec 2016 21:08:30 +0000 (21:08 +0000)
am: b2a40ee3b6

Change-Id: I4c3c440a53ba8385aabaad3c705a23672ea801cf


Trivial merge