tree ab02a16477a2129a90caa3f4731322071af98d63
parent e5eb4567d408808873d7193fcaf7bfea859ea725
parent 9f252193714c82dbce702e8055ffaa7eec4afe66
author Dan Willemsen <dwillemsen@google.com> 1446145957 +0000
committer android-build-merger <android-build-merger@google.com> 1446145957 +0000

Merge "Remove changing uids/timestamps from zip/jar files"
am: 9f25219371

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