tree d2ee08adb45b7ce3812216ac0b02ebd572902340
parent 7ad5f75b8f72dad11109aaa1c9d87795fd44c823
parent 220621089bd6a7cfac2c3d1a0fa8aeeffc94391b
author Xavier Ducrohet <xav@google.com> 1403393660 +0000
committer android-build-merger <android-build-merger@google.com> 1403393660 +0000

Merge "Fix zipalign/hprof-conv issue in ADT." into idea133
automerge: 2206210

* commit '220621089bd6a7cfac2c3d1a0fa8aeeffc94391b':
  Fix zipalign/hprof-conv issue in ADT.