Commit 16d3bc63 authored by Android Merger's avatar Android Merger Committed by Gerrit Code Review
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
parents 244e7d35 467009ec
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