tree 35c101bb92dc8657e8f8d972e9afc9c50f42f9bc
parent 8d5ff73ce4a3a48a414f25289ba5220f3e91f0cd
parent fddfc2c604bd51f11d65518a23f13ef153938500
author Alex Klyubin <klyubin@google.com> 1449543685 +0000
committer android-build-merger <android-build-merger@google.com> 1449543685 +0000

Merge "Do not run zipalign when building APK (except prebuilts)." am: b437f58006
am: fddfc2c604

* commit 'fddfc2c604bd51f11d65518a23f13ef153938500':
  Do not run zipalign when building APK (except prebuilts).