tree 607e8ac061655da52300d34d4c1edc750d8eb28a
parent 0c12f125cfc90f83475532e64aa7f533e02e3798
parent 045f311b0a5b3ceed09dfc4b4246c99183a2cef4
author Elliott Hughes <enh@google.com> 1379614881 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379614881 -0700

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

* commit '045f311b0a5b3ceed09dfc4b4246c99183a2cef4':
  Use $ANDROID_DATA and $ANDROID_ROOT to find the tzdata.