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)
commit64b4b8bb61444ce29d785b49b610997ff33ee74c
tree87f510086dad928a6332201625648cb71316d516
parentd161b06cf764a7da75572fab73b321a10e7571fc
parentf749719e53be6cbe71a1a72a531792f855d841da
Merge "Merge "Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am: 65abebbadd" into oc-mr1-dev am: 25cdef21dc" into oc-mr1-dev-plus-aosp
am: f749719e53

Change-Id: Id188cf438f1425c266e6806f231fb65987a4f13c