tree 828567b0e193fddb7c83c29c383e8edae6bbf0ef
parent a886508002f714185ab182b0e19b862863e9d774
parent 27412bf7d7fb8a4209fa7e56525491f137bff9de
author Neil Fuller <nfuller@google.com> 1501582265 +0000
committer android-build-merger <android-build-merger@google.com> 1501582265 +0000

Merge "Make time zone data app code unbundleable" into oc-mr1-dev
am: 27412bf7d7

Change-Id: I53cfd121b037fd4fb9bc7ff04f543d1a5ae4d244