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:
de9d31b
2e41d49
)
Merge "Revert incorrect NonNull assertions in ColorStateList loading"
author
TreeHugger Robot
<treehugger-gerrit@google.com>
Mon, 12 Feb 2018 19:17:14 +0000
(19:17 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Mon, 12 Feb 2018 19:17:14 +0000
(19:17 +0000)
1
2
core/java/android/content/res/ResourcesImpl.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/content/res/ResourcesImpl.java
Simple merge