tree 780c9acfb6863d78e70d1a9e11c08899a6d436a8
parent 4612d85b69e5bbb93c0249cca954d65aafb93b81
parent c7d10a0e4826660902d493177e691181260464e0
author Aaron Holden <aaronholden@google.com> 1532982938 -0700
committer android-build-merger <android-build-merger@google.com> 1532982938 -0700

Merge "Add isAutomotive and isVrHeadset to device-side FeatureUtil" into stage-aosp-pi-cts-dev
am: 46f2ea1b71

Change-Id: I0f576f8e44181e80768873aa27a4dfde6535a62c