tree a2a81b7c16c5a8bcfd475d39c1eb02782e0d856d
parent 28f25302a6f8d05dbc5a85be869b147a6b8bb5ca
parent 0b81bdb1b083fbfd5588916c1d788f8d37123374
author Neil Fuller <nfuller@google.com> 1560188668 -0700
committer android-build-merger <android-build-merger@google.com> 1560188668 -0700

Merge "Merge "Switch to use tz data module tz files, not runtime module" am: 1c5515c76a am: dfaa438238" into qt-dev-plus-aosp
am: 0b81bdb1b0

Change-Id: Ic31add0052a380fa1ae73fce4677d9cff0ca5228