tree 7d3b1e6396f2cb994c8fe6d6d206170870a5f1f5
parent eea325e5583803228a06d1a3395b6f994d45619b
parent 14c79bb8db40a38156b4ef228539c6e69c022063
author Xavier Ducrohet <xav@google.com> 1396634374 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396634374 +0000

am 14c79bb8: (-s ours) am f3ff0296: Move ZipAlign to build-tools. DO NOT MERGE.

* commit '14c79bb8db40a38156b4ef228539c6e69c022063':
  Move ZipAlign to build-tools. DO NOT MERGE.