tree 3dcd1b80bbe67108becb03660a3b08987c224113
parent 16b220da97eff7368302eb1eaf8362056f9a44da
parent 3e231a5e46c89e2b6377727ca2121ad617e956a9
author mariagpuyol <mariagpuyol@google.com> 1494893390 +0000
committer android-build-merger <android-build-merger@google.com> 1494893390 +0000

Merge "Fix the tests that interact with the menu" into oc-dev
am: 3e231a5e46

Change-Id: I1da23710e9c3e1adcb2c2c7eb95ba25fc8e68504