From: Neil Fuller <nfuller@google.com>
Date: Tue, 7 Apr 2015 13:16:45 +0000 (+0000)
Subject: am 957f6188: Merge "Changes to re-enable overrides for tz data"
X-Git-Tag: android-x86-6.0-r1~14^2~51
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d4451f130c754243f6c98880fa652874c567c4c3;p=android-x86%2Fbionic.git

am 957f6188: Merge "Changes to re-enable overrides for tz data"

* commit '957f6188fa7494ea8b7701b14df4c9127d27a9ef':
  Changes to re-enable overrides for tz data
---

d4451f130c754243f6c98880fa652874c567c4c3