tree dc526b376e1065f8cf67f269dc23d1c9ee28b1e9
parent c02dd25369dcdca2ec2b18fc1595281c3229c614
parent 2bc46e66b223513edefa48dd6df368f44e0ace8c
author Brian Muramatsu <btmura@google.com> 1351893881 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1351893881 -0700

Merge "Prevent monkey tests from toggling airplane mode" into jb-mr1-dev