merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Revert the fix for incorrect package-private overriding.

This fixes FIFA 2012, the download portion of which relies on the
old bug, without breaking instrumentation tests. The problem is that
dexopt tries to quicken method calls, and gets confused by this case
where the apparent static method resolution differs from the actual
one at runtime, depending on the targetSdkVersion of the specific app.
dexopt can't make an ahead-of-time decision in a world where the rules
might change at runtime.

Bug: 7301030
Bug: 7343420
Change-Id: Iaa15611f099546b7e54279cfd6abc9b4cdcb9812
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ia24bfd680910be16fa6f89fbd48db251b076d8f6
Fix alignment when recompacting a DexMerger result. do not merge.

(cherry picked from commit e0e7b076e427a327e27247aa409d0b0fa8b0e0aa)

Change-Id: Ib8092bd9ce9ba5490040a41c5d604e6a138acc7d
am 707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.

* commit '707ebe9f1984f7b1ed2e3465012c7c0eb3ef2bd6':
  Fix alignment when recompacting a DexMerger result. do not merge.
Revert "Fix alignment when recompacting a DexMerger result. do not merge."

This reverts commit 707ebe9f1984f7b1ed2e3465012c7c0eb3ef2bd6

Looks like jb-dev is missing some other patches before it possible to cherry-pick this one.

Change-Id: I8cbdd649d03696cb80be0dacc8640275468ef162
am 288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."

* commit '288f22800c8fe1eb44afff78ec1fff815379183e':
  Revert "Fix alignment when recompacting a DexMerger result. do not merge."
Merge f870f2d - do not merge

Change-Id: Ib8ea0f0d579f78fcab1deca05ff1beac9ba9bc03
Reconcile with jb-mr1-release - do not merge

Change-Id: Ic0fb72b0939908c2e072e4ae5d60c9d24de9dc66
am 2d2f13c5: (-s ours) am 707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.

* commit '2d2f13c50ba3c38dc4a8a8aaf483f6df155e0080':
  Fix alignment when recompacting a DexMerger result. do not merge.
am afe3a013: (-s ours) am 288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."

* commit 'afe3a0131e75367759e1d7a69cec0aac2a45524c':
  Revert "Fix alignment when recompacting a DexMerger result. do not merge."
am 437f58a5: am 2d2f13c5: (-s ours) am 707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.

* commit '437f58a5d25d76aa035c53e341e2516e39a70927':
  Fix alignment when recompacting a DexMerger result. do not merge.
am b6f4e037: am afe3a013: (-s ours) am 288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."

* commit 'b6f4e0372154191bdf1ee32727aead1fe1200cbc':
  Revert "Fix alignment when recompacting a DexMerger result. do not merge."
Fail if the new index is out of range. do not merge.

We were silently truncating, which made an obvious problem
into a non-obvious one.

Bug: http://code.google.com/p/android/issues/detail?id=40409

(cherry picked from commit 0a752f071fbbdfeab5dd9a230efe0f4f47b8cd94)

Change-Id: I6adbe6309bdcb2882f0e5500d6e1e149d08dbd2d
am 51997559: Fail if the new index is out of range. do not merge.

* commit '519975591eba13ae7ac4e494a0dfb88a34ca191b':
  Fail if the new index is out of range. do not merge.
Merge tag 'android-4.2.2_r1' into jb422

Android 4.2.2 release 1