tree dee79bc33b93af3899de72f9784fca4a79429b57
parent 9f918d9bb31cc2a27a8115cbc5f9961132b73c02
parent 3b870dbe34351db1dc856ae03878912f237ed1cd
author Shuo Qian <shuoq@google.com> 1524079900 -0700
committer android-build-merger <android-build-merger@google.com> 1524079900 -0700

[automerger skipped] Merge "Revert "Remove the OEM hook implementation and usage"" into pi-dev am: 78157b3778  -s ours
am: 3b870dbe34  -s ours

Change-Id: I69c9562501990e8ed66139856f0624adf6bb5534