tree 607e8ac061655da52300d34d4c1edc750d8eb28a
parent 814bbd521affba78db04135515bae1f5e099bbd9
parent cf178bf7d0300edfeec31528a744aa38a7177c0e
author Elliott Hughes <enh@google.com> 1379614740 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1379614740 +0000

Merge "Use $ANDROID_DATA and $ANDROID_ROOT to find the tzdata."