]> git.saurik.com Git - android/aapt.git/commit
am 2606fc48: Reconcile with jb-mr0-release jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Jul 2012 21:47:47 +0000 (14:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 30 Jul 2012 21:47:47 +0000 (14:47 -0700)
commit8dded8ba98dc6acf1dfa95ae4531f3c1f1528c83
treec13ea11e5dd9d18f1f564abbce2b1ec2caf4cd19
parentb315b97f128c85b272560f5fccb3cb984f51602b
parentf6e3509b9f86c192209dddd5f67adc7d5074c4a6
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.