tree d94047f92673005430833cabc3b47864977d85e9
parent 806fc4f9ec3b71c81ea5e920f495e195364f440b
parent 929d0ee01a88517afdd3385f3aac227983a21fb0
author Ying Wang <wangying@android.com> 1448402922 +0000
committer android-build-merger <android-build-merger@google.com> 1448402922 +0000

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

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