summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-07-30 15:10:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-30 15:10:27 -0700
commit905272a439b396161a1e2368fa49e1747cb24143 (patch)
tree6483e42e7ac1c4c66af87d2f940fb4872de28199 /core
parentdcdd25755128cbb5641448d9912b58b535890935 (diff)
parent8f21770cb5439f77422ee70aef4a3691c89f6611 (diff)
downloadframeworks_base-905272a439b396161a1e2368fa49e1747cb24143.zip
frameworks_base-905272a439b396161a1e2368fa49e1747cb24143.tar.gz
frameworks_base-905272a439b396161a1e2368fa49e1747cb24143.tar.bz2
am 8f21770c: am dc7d4627: am 2606fc48: Reconcile with jb-mr0-release jb-release
* commit '8f21770cb5439f77422ee70aef4a3691c89f6611': 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.
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions