Merge "Clean up dangling bitmaps." into nyc-mr1-dev

author Makoto Onuki <omakoto@google.com>

Tue, 10 May 2016 20:57:02 +0000 (20:57 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 10 May 2016 20:57:04 +0000 (20:57 +0000)
author Makoto Onuki <omakoto@google.com>
Tue, 10 May 2016 20:57:02 +0000 (20:57 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 10 May 2016 20:57:04 +0000 (20:57 +0000)
diff --cc services/core/java/com/android/server/pm/ShortcutService.java
Simple merge
diff --cc services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest.java
Simple merge
author	Makoto Onuki <omakoto@google.com>
	Tue, 10 May 2016 20:57:02 +0000 (20:57 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 10 May 2016 20:57:04 +0000 (20:57 +0000)
		1	2
services/core/java/com/android/server/pm/ShortcutService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest.java	patch \|	diff1 \|	diff2 \|	blob \| history