tree f3533094fdf60c2128924f20d50fe3be0b12ec59
parent 44a53bab4681b9793c4a6f6e78845baf9d82f849
parent 5be9960f664979b9acea972ddf114eaacb8acb58
author Neil Fuller <nfuller@google.com> 1484146962 +0000
committer android-build-merger <android-build-merger@google.com> 1484146962 +0000

Merge "Switch ConfigUpdater to the new version of timezone updater code" am: 216303cdb6
am: 5be9960f66

Change-Id: I7cc9fed8ca298bd559b94ff57fd881b0651a16bd