tree de2f4995d04698129d82b6760c801962466982e5
parent f0b5cd2de6b10038181ec53756b535be2cf105d3
parent c789be850ca14b945e72412457991d7a5e13126e
author Dan Willemsen <dwillemsen@google.com> 1446594210 +0000
committer android-build-merger <android-build-merger@google.com> 1446594210 +0000

Merge "Remove changing uids/timestamps from zip/jar files" am: a0975edc16
am: c789be850c

* commit 'c789be850ca14b945e72412457991d7a5e13126e':
  Remove changing uids/timestamps from zip/jar files