Commit 92d2ef13 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "[automerger skipped] Merge "DO NOT MERGE: Remove test that depends on... 

Merge "[automerger skipped] Merge "DO NOT MERGE: Remove test that depends on tz data" into lollipop-mr1-cts-dev am: 86251082 -s ours
am: 270ab191 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib651ee3bd65adca0052f5f6c506742a4bb5af36b
parents c00a8b58 270ab191
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