OSDN Git Service

Merge "Don\'t delete META-INF in jack-java-to-dex when packing resources."
authorYing Wang <wangying@android.com>
Tue, 24 Nov 2015 22:01:54 +0000 (22:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 Nov 2015 22:01:54 +0000 (22:01 +0000)
commitfdfd0b0d8145ccead681d921cfd33ba4c57d64fc
tree22e5ac4b4332ad84d65d6463866be710e76f134a
parent54ac6cd527eeb9784a0703a8ef0b017e290c813c
parent81bbac6a0fe76f2b007f6f0c2c3dc44f85fd4dd6
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.