Commit 467009ec authored by Tina Zhou's avatar Tina Zhou Committed by android-build-merger
Browse files

Merge "DO NOT MERGE Fix test_getZoneStrings_GMT_short_names" into lollipop-mr1-cts-dev 

am: 28c4f74b  -s ours

Change-Id: I032dbfec4918448829b232c8815db5499782411e
parents 244e7d35 28c4f74b
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