OSDN Git Service

[automerger skipped] Merge "Revert "Remove the OEM hook implementation and usage...
authorShuo Qian <shuoq@google.com>
Wed, 18 Apr 2018 18:12:20 +0000 (11:12 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Apr 2018 18:12:20 +0000 (11:12 -0700)
am: e116dcc57c  -s ours

Change-Id: Ia6518f01fd5dfec3909bac318f0596ed83013bcf


Trivial merge