Commit 46ec47b8 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: If41a3142c416aa6b9c30c344a97a426e3832695f
parents 3e9e0abc 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