OSDN Git Service

Merge "QS: Protect against crash with no icon" into nyc-dev
authorJason Monk <jmonk@google.com>
Wed, 1 Jun 2016 17:26:06 +0000 (17:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Jun 2016 17:26:06 +0000 (17:26 +0000)
commit2891acd139d0db993df975a97f953a194d5c0db2
tree84be0989c0922b3e670e2d7009073627fde1d18e
parentadc3f1ec2b8b85d1b3ced34e424e1b091f937b03
parent7b945d8d30a6e3978b50d5952539279a71148eca
Merge "QS: Protect against crash with no icon" into nyc-dev
am: 7b945d8d30

* commit '7b945d8d30a6e3978b50d5952539279a71148eca':
  QS: Protect against crash with no icon

Change-Id: I6bf6ddc7a8331c2e324c5ae7c065c4eb9eb9fead