OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
adc3f1e
7b945d8
)
Merge "QS: Protect against crash with no icon" into nyc-dev
author
Jason Monk
<jmonk@google.com>
Wed, 1 Jun 2016 17:26:06 +0000
(17:26 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 1 Jun 2016 17:26:06 +0000
(17:26 +0000)
am:
7b945d8d30
* commit '
7b945d8d30a6e3978b50d5952539279a71148eca
':
QS: Protect against crash with no icon
Change-Id: I6bf6ddc7a8331c2e324c5ae7c065c4eb9eb9fead
Trivial merge