tree 22e5ac4b4332ad84d65d6463866be710e76f134a
parent 54ac6cd527eeb9784a0703a8ef0b017e290c813c
parent 81bbac6a0fe76f2b007f6f0c2c3dc44f85fd4dd6
author Ying Wang <wangying@android.com> 1448402514 +0000
committer android-build-merger <android-build-merger@google.com> 1448402514 +0000

Merge "Don\'t delete META-INF in jack-java-to-dex when packing resources."
am: 81bbac6a0f

* commit '81bbac6a0fe76f2b007f6f0c2c3dc44f85fd4dd6':
  Don't delete META-INF in jack-java-to-dex when packing resources.