tree c3e6c0632c89975dff2defad1d6d45042ccdf771
parent afe40a3844227b29d641f8e53eaf8c2dbf04faf0
parent b1193dd15c509918f4d59c5ce43a23ff1a16e5c3
author Shuo Qian <shuoq@google.com> 1524859247 -0700
committer android-build-merger <android-build-merger@google.com> 1524859247 -0700

Merge "Restore the OEM hook implementation and usage" am: 39f6d948d7
am: b1193dd15c

Change-Id: I92aee1e59e829ccd8ff54962332dfda24a782744