Commit 536c73cb authored by Aaron Whyte's avatar Aaron Whyte Committed by Android Git Automerger
Browse files

am bd87555b: Merge "Fixes CTS test, matching Master. Bug: 15131296" into klp-modular-dev 

* commit 'bd87555b':
  Fixes CTS test, matching Master. Bug: 15131296
parents 786f94d9 bd87555b
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