tree 1f85f708f59cc825b826cf9798ace45801915675
parent 4f75b8053fee2067de736178ff22ac2d7d9af71f
parent 163196aa481eb8d279822ff93027526ca2c189c1
author Dan Willemsen <dwillemsen@google.com> 1446755726 +0000
committer android-build-merger <android-build-merger@google.com> 1446755726 +0000

Merge "Use explicitly sized types in zipalign/ziptime" am: 1b2685137e
am: 163196aa48

* commit '163196aa481eb8d279822ff93027526ca2c189c1':
  Use explicitly sized types in zipalign/ziptime