From: The Android Open Source Project <initial-contribution@android.com>
Date: Mon, 30 Jul 2012 21:47:47 +0000 (-0700)
Subject: am 2606fc48: Reconcile with jb-mr0-release jb-release
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/8dded8ba98dc6acf1dfa95ae4531f3c1f1528c83?hp=b315b97f128c85b272560f5fccb3cb984f51602b

am 2606fc48: Reconcile with jb-mr0-release jb-release

* commit '2606fc48cb2e65489056096227430b054c558767':
  Fix NPE on some phones at startup.
  Fix 6804479: "Emergency calls only" in notification shade
  Implement CMAS service category program results.
  Fix detection of CDMA cell broadcast messages.
  Fix our interpretation of apn setting's bearer.
  Implement CMAS service category program results.
  Fix detection of CDMA cell broadcast messages.
  Fix our interpretation of apn setting's bearer.
---