OSDN Git Service

Merge "Don\'t delete META-INF in jack-java-to-dex when packing resources." am: 81bbac6a0f
authorYing Wang <wangying@android.com>
Tue, 24 Nov 2015 22:04:55 +0000 (22:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 Nov 2015 22:04:55 +0000 (22:04 +0000)
commit929d0ee01a88517afdd3385f3aac227983a21fb0
treee429c7823b234b96279fd04d891c493879db1072
parentc5a9f9cbcc8cbec4a85f0eb25d225f371546833e
parentfdfd0b0d8145ccead681d921cfd33ba4c57d64fc
Merge "Don\'t delete META-INF in jack-java-to-dex when packing resources." am: 81bbac6a0f
am: fdfd0b0d81

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