Commit 98121f9b authored by Tina Zhou's avatar Tina Zhou Committed by android-build-merger
Browse files

Merge "Merge "DO NOT MERGE Fix test_getZoneStrings_GMT_short_names" into... 

Merge "Merge "DO NOT MERGE Fix test_getZoneStrings_GMT_short_names" into lollipop-mr1-cts-dev am: 28c4f74b  -s ours" into marshmallow-cts-dev
am: 16d3bc63  -s ours

Change-Id: Ia788c4c081b4ade7668d288612a777ecb9f7c9db
parents 8de6ec43 16d3bc63
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