From: The Android Open Source Project <initial-contribution@android.com>
Date: Tue, 19 Jun 2012 13:19:56 +0000 (-0700)
Subject: am 5158db8b: Reconcile with jb-release
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/cc558261488008b0de0b90e2c0b79bea1489f9d6

am 5158db8b: Reconcile with jb-release

* commit '5158db8b07e9512788ecf1f887643e8bc25ce48f':
  Fix an NPE and possible unsynchronized call of Locked method.
  Fix 6665117: ACTION_ASSIST visual improvements
  Capture window manager's last ANR state in bug report.
  Capture input dispatcher's last ANR state in bug report.
  Fix issue #6636731: Mariner animation ring gets stuck
  Jelly Bean ringtone Bug: 6619980
  Remove Disco video from builds.
  Change snap behavior for lock screen
  Improve ANR diagnostics.
  Detect bad behavior earlier in Choreographer.
  Revert "Fix fake bold for fallback fonts in frameworks."
  Include important native processes in watchdog stacks.
  Fix issue #6641368: can't launch gallery
---

cc558261488008b0de0b90e2c0b79bea1489f9d6