commit | afea5dfb6d59d8377bdffbdc83803ca0b14f6b1d | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Sun Jun 16 07:49:22 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jun 16 07:49:22 2013 -0700 |
tree | b09b1919ec343f308fddc1251e240e21f1fb943e | |
parent | 5e06d17c75388b90373c75ea3f59cca85353674f [diff] | |
parent | b832dfe72f1bbdec778b50f258eae29f17fd8e0b [diff] |
am b832dfe7: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit 'b832dfe72f1bbdec778b50f258eae29f17fd8e0b': Temporarily restore some support for icon==0 notifications.