summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2010-10-31 11:41:47 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-31 11:41:47 -0700
commit6b21cdeb5f0127862d82f24a4b6001f495e3c8cd (patch)
tree757e4448ac0b26d066c99ed29be25754bfe3b76b /core
parent9c3a80b236b389f9e7640298beee3bb6f89c9c4e (diff)
parent4058ba052682129f2d1055116aaffb2e91c2013d (diff)
downloadframeworks_base-6b21cdeb5f0127862d82f24a4b6001f495e3c8cd.zip
frameworks_base-6b21cdeb5f0127862d82f24a4b6001f495e3c8cd.tar.gz
frameworks_base-6b21cdeb5f0127862d82f24a4b6001f495e3c8cd.tar.bz2
Merge "Allow both contentIntent and setOnClickPendingIntent in notifications"
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions