am 24597eb7: Merge "Tone down Tethering logs." into ics-mr1

* commit '24597eb77e1a88994b83c5b1f45d5b72383943b8':
  Tone down Tethering logs.
am be70785f: Make activity manager more robust in the face of app activity leaks.

* commit 'be70785f9b2dbd2c52fd8676d99bc64b22784201':
  Make activity manager more robust in the face of app activity leaks.
am c51bb4d3: Merge "XML parsing optimizations" into ics-mr1

* commit 'c51bb4d394dd47e48abc8a6d9cbc740f821546ff':
  XML parsing optimizations
am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0

* commit '5ad6f646fbe692b94961df6472bec2b8bd1ea382':
  docs: ndk r7 rel notes
am 5f8b7269: docs: fix typo

* commit '5f8b7269d66acb45dcb74a1eb38102cb1d1431df':
  docs: fix typo
am 6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0

* commit '6200a4b7eb07507055af93ec1a054640a39b9751':
  DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.

* commit 'f1f0c873b1d119a19342cb67ca77b59607951659':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
am 19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0

* commit '19b1c12b5eb3417e9f56810cc08ee1e560da0a99':
  Docs: update state list drawable with state_activated and revise selected/focused
am a8743f15: Fix bug 5425280 - Two ActionBar icons show up

* commit 'a8743f152aac4a8ef97c79bdad5232614453ce2a':
  Fix bug 5425280 - Two ActionBar icons show up
am 83c16e25: am 5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0

* commit '83c16e2577705b577d2c74d45b0e55a50a0806e2':
am 632f072b: am 5f8b7269: docs: fix typo

* commit '632f072b223f5f682f4152551a61cec2456b2186':
am 771d0c99: am 6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0

* commit '771d0c99f6433c3ad7063cdfa847c9476ef0453c':
am 6f0464e7: am f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.

* commit '6f0464e79d6d41d8255a6b0b6695fa7f67a0f65f':
am 2af9f21c: am 19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0

* commit '2af9f21c664d4579b5f51283a320a7d1fba13a75':
am 28587497: Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817" into ics-mr1

* commit '2858749704ea7b130499cf2ac7b3e1c3331f1582':
  Discard framebuffer rendering queues when discarding layers Bug #5581817
am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1

* commit '030bb99814157b6424c0bf290bd2ede217b5ba77':
  audioflinger: fix noise when skipping to next song
am cde433c5: Merge "Fixing a race condition in RSSurfaceView. Bug 5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context." into ics-mr1

* commit 'cde433c5f75fd4ac2ab31e9fc34654750d1e83f8':
  Fixing a race condition in RSSurfaceView. Bug 5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context.
am c93a151f: Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1

* commit 'c93a151fde7d616c22b86ae458b3d015e3820d5e':
  Define, document, and test the behavior of very large SurfaceTextures
am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1

* commit '72a31ab98f8687aa48fce028d54e79929780a302':
  [maguro] Fix STK issues
am 9d66da8a: Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1

* commit '9d66da8ae61a8520f46ee7df3cbb374852d9da91':
  Revert "Discard framebuffer rendering queues when discarding layers"