tree cda7669a5bdc5a310401cfe6f41eac990b34597a
parent 2c84b1d3320f5eec2b4119b4f8feeb5763aac3ae
author Naveen Kalla <mrnaveen@google.com> 1491848714 -0700
committer Naveen Kalla <mrnaveen@google.com> 1491850109 -0700

Revert "master is now OPD1/ODR by default and adding OPM1/OMR1"

This reverts commit 9af3fa123c6e3347acea4657cb4969b421618c3a.

Bug: 37201939
Test: Build, load and ensure that hidden menu can be launched
Change-Id: I1641cb528883f912a8051c7660e2750985bafae8