tree f32f8360509d3a42e24e4014fc24dd5fac0349bd
parent a1d82ef12edd758f20c056490f1210b037996bf2
parent 8fe9274ab99a0a5e8894a8984d47a9c5a9c0c17c
author Tao Bao <tbao@google.com> 1460672445 +0000
committer android-build-merger <android-build-merger@google.com> 1460672445 +0000

Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip." into nyc-dev
am: 8fe9274

* commit '8fe9274ab99a0a5e8894a8984d47a9c5a9c0c17c':
  Makefile: Pack squashfs and f2fs tools into otatools.zip.

Change-Id: I1e6830d90b471c70d6de450e0f0c04943dc38fec