diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-03-15 11:54:46 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@android.com> | 2011-03-15 11:54:46 -0700 |
| commit | b8796212e3544262193960ade01db6cb2023c8f9 (patch) | |
| tree | 19c0985c9095029ae4fba30d617f263858ed8a38 /core/java/android/app | |
| parent | d927e2742871dec1cf9a8d861a24d5bcc73c542e (diff) | |
| parent | ceae99835ed909346f23cc604d20a488ac63c6ce (diff) | |
| download | frameworks_base-b8796212e3544262193960ade01db6cb2023c8f9.zip frameworks_base-b8796212e3544262193960ade01db6cb2023c8f9.tar.gz frameworks_base-b8796212e3544262193960ade01db6cb2023c8f9.tar.bz2 | |
resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp
Change-Id: Ic677e58dcc182908ae1fde33047b3fda013a37c3
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/Notification.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index ccd65de..c9351af 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -416,7 +416,7 @@ public class Notification implements Parcelable if (this.largeIcon != null) { that.largeIcon = Bitmap.createBitmap(this.largeIcon); } - that.iconLevel = that.iconLevel; + that.iconLevel = this.iconLevel; that.sound = this.sound; // android.net.Uri is immutable that.audioStreamType = this.audioStreamType; |