OSDN Git Service

Merge "Fix tzdata loading." am: 0bee605aab am: 00a37e58e2
authorElliott Hughes <enh@google.com>
Mon, 3 Oct 2016 23:43:14 +0000 (23:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 3 Oct 2016 23:43:14 +0000 (23:43 +0000)
commit6bf4e59b121a40ed9579d7388e3275aa723492b1
tree78069020d7149643802bdf8b07b762b2f473e7bf
parentb0ed647992527cb280ee62e1149b20ca7b4f48c7
parentfb88cbf674e27933ea8ace30cac6ed4277eb06f6
Merge "Fix tzdata loading." am: 0bee605aab am: 00a37e58e2
am: fb88cbf674

Change-Id: I6196a37b9ee359ad04a61a0252d104e2b37bf0d9