tree 0dd0ee97fec1401e0f00f5d8dd55373ec5157e6e
parent 48fe694ad414666e1de7a9166a3174e48cde9f82
parent 177c6eae2e50673df595a5014fcdfbf7dde8d431
author Neil Fuller <nfuller@google.com> 1523989853 -0700
committer android-build-merger <android-build-merger@google.com> 1523989853 -0700

[automerger skipped] Merge "DO NOT MERGE: Remove test that depends on tz data" into nougat-mr1-cts-dev
am: 177c6eae2e  -s ours

Change-Id: I7b605d87408184102919c082823ff1045ea4351a