tree bd61011c2ad08698ec3467f3ac4d3c1cd207a2ea
parent c0357ff6f2a664c2a0744665af73d5ccf8c68fed
parent 0675f542a8a6d364cbda582cc6b9d7e208809324
author Nick Kralevich <nnk@google.com> 1463074612 +0000
committer android-build-merger <android-build-merger@google.com> 1463074612 +0000

Merge "Merge "Merge "Merge "BannedFilesTest: Detect "rootmydevice" vulnerability" into kitkat-cts-dev am: dd8ee3dca0" into lollipop-cts-dev am: 0732f30afe" into lollipop-mr1-cts-dev am: dba358fa3e" into marshmallow-cts-dev
am: 0675f542a8

* commit '0675f542a8a6d364cbda582cc6b9d7e208809324':
  BannedFilesTest: Detect "rootmydevice" vulnerability

Change-Id: I201305fb8e410bdee54ed8b0b1b8ae97ad209828