Commit a0f14f5b authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am b72e08ae: am 4ac33246: Merge "Fix CTS build on AOSP/master" 

* commit 'b72e08ae':
  Fix CTS build on AOSP/master
parents d399e8a5 b72e08ae
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