tree 525ae8a5b4ebaa83892356bd8566a700827c1206
parent 523fc719d139f05737a3e2c1fad40885694362e8
parent caee2573f9775e70c80f067d95e93614bc335093
author Shuo Qian <shuoq@google.com> 1524859217 -0700
committer android-build-merger <android-build-merger@google.com> 1524859217 -0700

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

Change-Id: I8a29091c8726a4e5160ec00c205ec1782c6842fb