tree bf400bca1ccfe2c64808bfa33e836c7d7805e39e
parent d86f49d3f7bc4e9ec6c3ddffa4723ef624eb66b2
parent de72a98328213a5929723913086b20023335d07b
author Andrew Dodd <atd7@cornell.edu> 1426778909 +0100
committer Gerrit Code Review <gerrit2@gerrit> 1426778910 +0100

Merge "Revert "Force sync files written by minzip."" into android-5.1