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:
eaa1c9a
c11df25
)
Merge "Add colorSecondary theme attribute." into nyc-mr1-dev
author
Andrew Sapperstein
<asapperstein@google.com>
Thu, 23 Jun 2016 18:37:40 +0000
(18:37 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 23 Jun 2016 18:37:42 +0000
(18:37 +0000)
1
2
api/current.txt
patch
|
diff1
|
diff2
|
blob
|
history
api/system-current.txt
patch
|
diff1
|
diff2
|
blob
|
history
api/test-current.txt
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/attrs.xml
patch
|
diff1
|
diff2
|
blob
|
history
packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
api/current.txt
Simple merge
diff --cc
api/system-current.txt
Simple merge
diff --cc
api/test-current.txt
Simple merge
diff --cc
core/res/res/values/attrs.xml
Simple merge
diff --cc
packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java
Simple merge
OSDN Git Service
