tree b7e113b668c80910d61fdbe75f9026f27c57cc04
parent bae52d8f19ffc1c40e84fb76d6e3829348ecfe54
parent ac71c57c88050f2bc46ea75320f03c62c708c91a
author Steven Moreland <smoreland@google.com> 1522125997 +0000
committer android-build-merger <android-build-merger@google.com> 1522125997 +0000

Merge "Add DISABLE_RILD_OEM_HOOK." into pi-dev
am: ac71c57c88

Change-Id: I490e1d14b7575ba8628243db67f63912dd35c24e