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

Merge "DO NOT MERGE: Remove test that depends on tz data" into stage-aosp-oc-mr1-cts-dev 

am: 703d4e20  -s ours

Change-Id: I83ec283ed32b9eff2e9a92a3a0be8939bdc96cbf
parents 996ca562 703d4e20
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