tree ca74385bbecd90dce0f8d1179b93eaa2549fe2f7
parent 9ad79795de539c321ee7daef364e45f15ccfcb55
parent 622f9b35cedfe56a7502f932aac60bea2d73da44
author Nick Kralevich <nnk@google.com> 1553807055 -0700
committer android-build-merger <android-build-merger@google.com> 1553807055 -0700

Merge "zip_writer.cc: update powerof2 and use it unconditionally" am: b86e248e8b am: 0fd9adf747
am: 707d0b6da5

Change-Id: Iac67cf33d1bd51920cd06741f9e39ab3ccabf3b8