tree 2abc0368379e86315cd522b6ef3cb590cc4b09ff
parent 81e5f37786f383a1fbdc4e8a53ce12e64ce1a0de
parent 5887bfbe203d47849993b3cdbe54d6f0a155a071
author Dan Willemsen <dwillemsen@google.com> 1446154927 +0000
committer android-build-merger <android-build-merger@google.com> 1446154927 +0000

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

* commit '5887bfbe203d47849993b3cdbe54d6f0a155a071':
  Revert "Remove changing uids/timestamps from zip/jar files"