tree 84d1749ffe8ff6cee7ef3eefd5ce2d3eaf266834
parent 6959e45a012e2c4d2d27ae33728ac35422e3b924
parent dd21a4ec6c4c37cde78313c7976158c501ef87b3
author Shuo Qian <shuoq@google.com> 1524615765 -0700
committer android-build-merger <android-build-merger@google.com> 1524615765 -0700

Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev am: e6c721390e
am: dd21a4ec6c

Change-Id: I694f91295a183c510e23b1879f7d2d3c485d2682