am f8d689bc: am 4d696eb4: Merge "Fix a bug in ZoneCompactor that meant the zonetab offset was wrong."

* commit 'f8d689bc56976f8bd37b306053154a0e9d17fb1d':
  Fix a bug in ZoneCompactor that meant the zonetab offset was wrong.

libc/tools/zoneinfo/ZoneCompactor.java

@@ -198,6 +198,8 @@ public class ZoneCompactor {
     // Write the data.
     f.write(allData.toByteArray());
 
+    int zonetab_offset = (int) f.getFilePointer();
+
     // Copy the zone.tab.
     reader = new BufferedReader(new FileReader(zoneTabFile));
     while ((s = reader.readLine()) != null) {
@@ -208,8 +210,6 @@ public class ZoneCompactor {
     }
     reader.close();
 
-    int zonetab_offset = (int) f.getFilePointer();
-
     // Go back and fix up the offsets in the header.
     f.seek(index_offset_offset);
     f.writeInt(index_offset);