tree 28fbdee5eec450dab50d608949e2fbe9ce3d18cc
parent 7f49aa4b75162a57a5d13f02dc3acd82141eebed
parent 3bee82f5d77e686154e37e95491c4ad3c649dd3d
author Connor O'Brien <connoro@google.com> 1481662950 +0000
committer android-build-merger <android-build-merger@google.com> 1481662950 +0000

Merge "Add android.hardware.consumerir@1.0 service."
am: 3bee82f5d7

Change-Id: Ic073c5e68c57ea0aecf64f7d2f032bdefcc73c61