OSDN Git Service

Merge "Fix ProtoId ordering check in DexFileVerifier." into nyc-dev
authorVladimir Marko <vmarko@google.com>
Tue, 10 May 2016 13:34:13 +0000 (13:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 May 2016 13:34:13 +0000 (13:34 +0000)
commit4b5023115264256d61781a0ccb3b8409539b6806
tree18c4761cbbe47877fd4e9ecc6ec10a2fc095ee77
parentd5f2d7141103d5bc14386c4c567088b8099f4cf5
parentf11e5473461d9f33d4427187fb945a1edcf2ef34
Merge "Fix ProtoId ordering check in DexFileVerifier." into nyc-dev
am: f11e547346

* commit 'f11e5473461d9f33d4427187fb945a1edcf2ef34':
  Fix ProtoId ordering check in DexFileVerifier.

Change-Id: Ice809c9f52019b6bc26ed8b374be5de098569a63