tree d3373f16b5330f24bd72039cb49a04c0195298c9
parent 5b68325591421fa1a0e176f964aef8374caf2c20
parent 093ade312d402c3453663db746d1f90787890d2b
author Shuo Qian <shuoq@google.com> 1524858623 -0700
committer android-build-merger <android-build-merger@google.com> 1524858623 -0700

Merge "Restore the OEM hook implementation and usage"
am: 093ade312d

Change-Id: I9f2f44e24c3b926609efa85cfb932d06422cc40c