tree fd38d063bfdd5ef35ba8ea77043713309c1db8b3
parent 125bb9c6490a9c6bfbbecee556c3f5e8e27738d9
parent c1c7ce8dab0467a510848bcd4fa50219c2feacee
author Patrice Arruda <patricearruda@google.com> 1557783852 -0700
committer android-build-merger <android-build-merger@google.com> 1557783852 -0700

Merge "Convert system/timezone/output_data/iana/Android.mk to Android.bp." am: b62b9651f9
am: c1c7ce8dab

Change-Id: I9f95a6fc63f6879c6cbf38f4d010e9a38ff42f3a