tree dfc1d117e327622c76d33d20697fb7b6aa3fcfcd
parent a76a06e05e588b18cdc77dfec05ec1c3758fe95f
parent aa851650bf73d8143da011013bd64cd49969be96
author Dan Willemsen <dwillemsen@google.com> 1446146455 +0000
committer android-build-merger <android-build-merger@google.com> 1446146455 +0000

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

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