tree 09ba8b8232bc20d2933005ce1e7d7de7a4002717
parent ac464002d328e5db0b50e53dbf0c4f71d5c01f32
parent a22efb407b4c7c04734dd7f63670be666a252468
author Daniel Xie <dxie@google.com> 1445365470 +0000
committer android-build-merger <android-build-merger@google.com> 1445365470 +0000

Merge "DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam" into lollipop-mr1-cts-dev am: e771efe6f0  -s ours
am: a22efb407b

* commit 'a22efb407b4c7c04734dd7f63670be666a252468':
  DO NOT MERGE CtsVerifier: Remove failed cases in BYOD Disable NFC beam