resolved conflicts for merge of ca2c6f75 to jb-mr1-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Fri, 13 Sep 2013 18:09:46 +0000 (11:09 -0700)
committerElliott Hughes <enh@google.com>
Fri, 13 Sep 2013 18:09:46 +0000 (11:09 -0700)
commit5d0ad38c72951ef180742efb27933ecd6e9d9593
tree2ecd75507816e6cb3ae54b1b24c780107f35d991
parent267290b340bee74e5ebbbc60f8c5a9b2a5453957
parentca2c6f75a87b7ff5578dff531481e1af540b43cc
resolved conflicts for merge of ca2c6f75 to jb-mr1-dev-plus-aosp

Change-Id: If84f3c832a21ca1adf1a8009f50aa4a10f42a57e
libc/zoneinfo/tzdata