Commit 6571935e authored by Aaron Whyte's avatar Aaron Whyte Committed by Android Git Automerger
Browse files

am 536c73cb: am bd87555b: Merge "Fixes CTS test, matching Master. Bug:... 

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

* commit '536c73cb':
  Fixes CTS test, matching Master. Bug: 15131296
parents 484c0fbe 536c73cb
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