tree f4199000a3fd0a48dcae79d86d2cf769c7251f19
parent 13a80521c32b92b34278c71c6e762688d449b3b0
parent e12f875cc9ba3a731dc8e25342d693b9599b3d68
author Shuo Qian <shuoq@google.com> 1524075194 -0700
committer android-build-merger <android-build-merger@google.com> 1524075194 -0700

[automerger skipped] Revert "Remove the OEM hook implementation and usage"
am: e12f875cc9  -s ours

Change-Id: Ic9c9c931601444c0a40552912253cd1569fe19df