OSDN Git Service

Merge "Merge "Merge "Fix NPE when reading icon for removed session." into oc-dr1...
authorJeff Sharkey <jsharkey@android.com>
Thu, 3 Aug 2017 00:38:01 +0000 (00:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 00:38:01 +0000 (00:38 +0000)
am: f749719e53

Change-Id: Id188cf438f1425c266e6806f231fb65987a4f13c


Trivial merge