Commit 515d2bd0 authored by Harry Zhang's avatar Harry Zhang Committed by android-build-merger
Browse files

[automerger skipped] Merge "Added a sleep scenario to platform_testing/." am:... 

[automerger skipped] Merge "Added a sleep scenario to platform_testing/." am: 461f5b81 am: f50e0767
am: 0ac33536  -s ours

Change-Id: If063dffa6075ec181a3dd8f047a35415b1f1a037
parents 1d378469 0ac33536
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