am 73082851: Merge "Fix Dex.create(ByteBuffer) to not allocate a byte[] to check magic"

* commit '73082851de098e1c56d7d19a10d5d0cb722d5fd9':
  Fix Dex.create(ByteBuffer) to not allocate a byte[] to check magic
am 1d28a94d: Merge "Improve exception detail message"

* commit '1d28a94d118bc227a6158dba6925fa3dc22e73a7':
  Improve exception detail message
am 22da590f: Merge "Remove redundant alignToFourBytes in favor of alignToFourBytesWithZeroFill"

* commit '22da590f4ff92c917375a3793935912031a108cf':
  Remove redundant alignToFourBytes in favor of alignToFourBytesWithZeroFill
am b2a9cdb4: Merge "Make Dex access faster by making binarySearch work."

* commit 'b2a9cdb4aa9ea54ba3321da199a96bd1e7a12722':
  Make Dex access faster by making binarySearch work.
am 0b42772c: Merge "Fix DexMerger to emit dex files without extended op codes."

* commit '0b42772c20d87d468bb095205c5461dacbbe9cea':
  Fix DexMerger to emit dex files without extended op codes.
am 9b040f6a: Merge "Add missing @Override annotations"

* commit '9b040f6a4e6865ee72db707d27381d4886229eaa':
  Add missing @Override annotations
am 619c4ad4: Merge "Manually merge "Compact merged dexes on their byte aligned size""

* commit '619c4ad482132e16c9849cf5ff3216f5166d4ee9':
  Manually merge "Compact merged dexes on their byte aligned size"
am c8bc5f77: Merge "*libcore* resolved conflicts for merge of bc23c4f3 to dalvik-dev"

* commit 'c8bc5f77ee2a996e771fb1814a47cc5c8bf93d5e':
  *libcore* resolved conflicts for merge of bc23c4f3 to dalvik-dev
am db4ebcbc: Merge "Fix an ugly bug where try/catch offsets weren\'t being mapped properly"

* commit 'db4ebcbc52f84708248cd4b773c4fc3063a615ef':
  Fix an ugly bug where try/catch offsets weren't being mapped properly
am 82656d62: am 6f284a09: Merge "Move dex utilities from dalvik/dx to libcore/dex part 2"

* commit '82656d62e8ba1201d199c09b934ff72ba20e6559':
  Move dex utilities from dalvik/dx to libcore/dex part 2
am 6bd674d3: am 519fb611: Merge "Add Dex.create(ByteBuffer)"

* commit '6bd674d33077431e57ec9083a6ff94540ed0bbd4':
  Add Dex.create(ByteBuffer)
am e0ecf4a9: am 9252b359: Merge "Switch Dex from byte[] to ByteBuffer for backing store."

* commit 'e0ecf4a94a50dce3782fe7cbcac9938d873393f4':
  Switch Dex from byte[] to ByteBuffer for backing store.
am 5eeb1017: am 73082851: Merge "Fix Dex.create(ByteBuffer) to not allocate a byte[] to check magic"

* commit '5eeb1017b63d3869930c4b46534804684df3878a':
  Fix Dex.create(ByteBuffer) to not allocate a byte[] to check magic
am 725c1375: am 1d28a94d: Merge "Improve exception detail message"

* commit '725c137531c15eeea48130e783bf4035b1963058':
  Improve exception detail message
am 66d35fb1: am 22da590f: Merge "Remove redundant alignToFourBytes in favor of alignToFourBytesWithZeroFill"

* commit '66d35fb15c13da551a3130a13e293593149903fc':
  Remove redundant alignToFourBytes in favor of alignToFourBytesWithZeroFill
am 6587070a: am b2a9cdb4: Merge "Make Dex access faster by making binarySearch work."

* commit '6587070aa5d6da060b4b10a40f38505c8dad4595':
  Make Dex access faster by making binarySearch work.
am a9e818e1: am 0b42772c: Merge "Fix DexMerger to emit dex files without extended op codes."

* commit 'a9e818e1be628743755fb24ef6dcedbfebc7bf8b':
  Fix DexMerger to emit dex files without extended op codes.
am b49e8eb6: am 9b040f6a: Merge "Add missing @Override annotations"

* commit 'b49e8eb63f768e195869a98076dc96514f357a14':
  Add missing @Override annotations
am 693dfbf3: am 619c4ad4: Merge "Manually merge "Compact merged dexes on their byte aligned size""

* commit '693dfbf351e5b8f8faec7db8f397e14ae19b877d':
  Manually merge "Compact merged dexes on their byte aligned size"
am d14543e0: am c8bc5f77: Merge "*libcore* resolved conflicts for merge of bc23c4f3 to dalvik-dev"

* commit 'd14543e02d7d7835c1edff33c46a2c099e3b9cb1':
  *libcore* resolved conflicts for merge of bc23c4f3 to dalvik-dev