tree c902e4d9f9f084ce51e21d7dc4f8dd187a13c8b4
parent 8c33b952059aa3d9f9374106839ae9aec80ac471
parent d6679fbc7e3fdafa4b8b2f554f5f53fef00af696
author Ying Wang <wangying@android.com> 1442948217 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442948217 +0000

am d6679fbc: am 9412efdc: Merge "Don\'t build otatools.zip if we don\'t build the ota package."

* commit 'd6679fbc7e3fdafa4b8b2f554f5f53fef00af696':
  Don't build otatools.zip if we don't build the ota package.