tree 9bda6262e0e7df1c8e182524e82362502c055ab1
parent a51b1d532e998c1668fd991f53c6619e02d9338a
parent 49d8c5196eb690fc987673c27cb61087c5886be4
author Dan Willemsen <dwillemsen@google.com> 1446154419 +0000
committer android-build-merger <android-build-merger@google.com> 1446154419 +0000

Merge "Revert "Remove changing uids/timestamps from zip/jar files""
am: 49d8c5196e

* commit '49d8c5196eb690fc987673c27cb61087c5886be4':
  Revert "Remove changing uids/timestamps from zip/jar files"