Commit f3f5b960 authored by Zoltan Szatmary-Ban's avatar Zoltan Szatmary-Ban Committed by Android Git Automerger
Browse files

am 1d69c0e5: resolved conflicts for merge of 79892c8d to lmp-mr1-dev 

* commit '1d69c0e5':
  Differentiate device feature checking across Device Policy tests
parents 90be2c53 1d69c0e5
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment