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)
am: 00a37e58e2

Change-Id: I11c5253bb95f2485788ec9f522dba9763089c686


Trivial merge