diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:12:02 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:12:02 +0200 |
commit | ddea472c69083c7ddee07d4512b70fe58a27ad23 (patch) | |
tree | 11d478b94b504d682b2738c59b2744a0d843b971 | |
parent | 3829171c29ec8b8474fdac847c6b841cbc62adf6 (diff) | |
parent | b375ba5339a2969f1c35709edaf9c07496d8830b (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I427a8b159440fa8a01dfb2267215cb83b2524a79
-rw-r--r-- | examples/androidextras/notification/android-sources/res/drawable/icon.png | bin | 4627 -> 3953 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/androidextras/notification/android-sources/res/drawable/icon.png b/examples/androidextras/notification/android-sources/res/drawable/icon.png Binary files differindex 156243d..e870213 100644 --- a/examples/androidextras/notification/android-sources/res/drawable/icon.png +++ b/examples/androidextras/notification/android-sources/res/drawable/icon.png |