OSDN Git Service

Merge "Fix tzdata loading." am: 0bee605aab
authorElliott Hughes <enh@google.com>
Mon, 3 Oct 2016 23:39:40 +0000 (23:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 3 Oct 2016 23:39:40 +0000 (23:39 +0000)
commitfb88cbf674e27933ea8ace30cac6ed4277eb06f6
tree3d7ab14836caafda998bbd584d1c26c01858276f
parentd3181bc5276118c9d64ce48f874565b41e94cf40
parent00a37e58e2a7e7317dd64993d2f3a66bd9ab68bb
Merge "Fix tzdata loading." am: 0bee605aab
am: 00a37e58e2

Change-Id: I11c5253bb95f2485788ec9f522dba9763089c686