commit 6bd62be8fe03a99deb34cbb44df85cb48c8571d6
author Neil Fuller <nfuller@google.com> Wed Mar 13 01:59:07 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Mar 13 01:59:07 2019 -0700
tree 4371d02db41f30de0d9474ec1ecacf44fa87a673
parent 3e10ab7e1269cd891374e1ec5226d05b3dd28000
parent 78f3d5b0f28b4937153d650753512a8528f530b5

Merge "Add an env variable for the tzdata module root" am: 822dbd8911
am: 8c8d8f5df9

Change-Id: Id3d64d79c6874314ad35f26e2459fc316adf9141

rootdir/init.environ.rc.in

diff --git a/rootdir/init.environ.rc.in b/rootdir/init.environ.rc.in
index 5d6cd2d..455c9a8 100644
--- a/rootdir/init.environ.rc.in
+++ b/rootdir/init.environ.rc.in
@@ -6,6 +6,7 @@
     export ANDROID_DATA /data
     export ANDROID_STORAGE /storage
     export ANDROID_RUNTIME_ROOT /apex/com.android.runtime
+    export ANDROID_TZDATA_ROOT /apex/com.android.tzdata
     export EXTERNAL_STORAGE /sdcard
     export ASEC_MOUNTPOINT /mnt/asec
     export BOOTCLASSPATH %BOOTCLASSPATH%