From: Elliott Hughes <enh@google.com>
Date: Fri, 9 Oct 2015 22:35:24 +0000 (+0000)
Subject: Merge "Sync with upstream tzcode (2015g)."
X-Git-Tag: android-x86-7.1-r1~270^2~74^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f41fe717;p=android-x86%2Fbionic.git

Merge "Sync with upstream tzcode (2015g)."
---

f41fe717655f01affc1d8244ff9efccc04d86620