Merge "Upgrade bionic to tzdata2014j."
authorElliott Hughes <enh@google.com>
Wed, 12 Nov 2014 02:32:09 +0000 (02:32 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 12 Nov 2014 02:32:10 +0000 (02:32 +0000)

Trivial merge