tree 74eea765bc16a22fac92f7d31b7b050efabf106f
parent 6d549abdf13666dee95cf9ee1d22ea5501aa0486
parent 862510826b226ca0c0e9e2f2dd7d3ae8d9aca2cc
author Neil Fuller <nfuller@google.com> 1546970981 -0800
committer android-build-merger <android-build-merger@google.com> 1546970981 -0800

[automerger skipped] Merge "DO NOT MERGE: Remove test that depends on tz data" into lollipop-mr1-cts-dev
am: 862510826b -s ours
am skip reason: subject contains skip directive

Change-Id: I56813beabe7ecb5bb5f853b9e21cac354f5460e7