summaryrefslogtreecommitdiffstats
path: root/core/java/android/os
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2010-02-18 04:52:46 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-18 04:52:46 -0800
commit6371a2d31f30b473e91be9cced64a2527c086af1 (patch)
tree9dafb02ba85a688a3cfaef817f7b5a2c55c2edcc /core/java/android/os
parentab4835ee0df866a4f7982644742e2b758c50fdd7 (diff)
parentee3bbefd34fd5330ebbc59175a328197ab7526af (diff)
downloadframeworks_base-6371a2d31f30b473e91be9cced64a2527c086af1.zip
frameworks_base-6371a2d31f30b473e91be9cced64a2527c086af1.tar.gz
frameworks_base-6371a2d31f30b473e91be9cced64a2527c086af1.tar.bz2
am ee3bbefd: Merge "Don\'t crash the system process when apps give us a bad foreground service notification." into eclair
Merge commit 'ee3bbefd34fd5330ebbc59175a328197ab7526af' into eclair-plus-aosp * commit 'ee3bbefd34fd5330ebbc59175a328197ab7526af': Don't crash the system process when apps give us a bad foreground service notification.
Diffstat (limited to 'core/java/android/os')
0 files changed, 0 insertions, 0 deletions