tree d8362667741be665417cc89cd3b1c52fb9028b3f
parent d85d0b4c2398dba3da126608c9fb79f6971a7b18
parent 26e71c19875e36ca4f37993bd0b40cdf2d9aee4e
author Elliott Hughes <enh@google.com> 1379615035 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379615035 -0700

am 26e71c19: am 045f311b: Merge "Use  and  to find the tzdata."

* commit '26e71c19875e36ca4f37993bd0b40cdf2d9aee4e':
  Use $ANDROID_DATA and $ANDROID_ROOT to find the tzdata.