| author | Elliott Hughes <enh@google.com> | |
| Fri, 13 Sep 2013 18:09:46 +0000 (11:09 -0700) | ||
| committer | Elliott Hughes <enh@google.com> | |
| Fri, 13 Sep 2013 18:09:46 +0000 (11:09 -0700) | ||
| commit | 5d0ad38c72951ef180742efb27933ecd6e9d9593 | |
| tree | 2ecd75507816e6cb3ae54b1b24c780107f35d991 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 267290b340bee74e5ebbbc60f8c5a9b2a5453957 | commit | diff |
| parent | ca2c6f75a87b7ff5578dff531481e1af540b43cc | commit | diff |
resolved conflicts for merge of ca2c6f75 to jb-mr1-dev-plus-aosp
Change-Id: If84f3c832a21ca1adf1a8009f50aa4a10f42a57e
Change-Id: If84f3c832a21ca1adf1a8009f50aa4a10f42a57e
| libc/zoneinfo/tzdata | diff1 | | | | blob | history |