From: Elliott Hughes <enh@google.com>
Date: Mon, 3 Oct 2016 23:39:40 +0000 (+0000)
Subject: Merge "Fix tzdata loading." am: 0bee605aab
X-Git-Tag: android-x86-8.1-r1~296^2~188^2~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fb88cbf674;p=android-x86%2Fbionic.git

Merge "Fix tzdata loading." am: 0bee605aab
am: 00a37e58e2

Change-Id: I11c5253bb95f2485788ec9f522dba9763089c686
---

fb88cbf674e27933ea8ace30cac6ed4277eb06f6