]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b315b97 f6e3509)
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)
* 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.


Trivial merge
mirror of aapt