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:
ccd53ee
2d70a5a
)
am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge...
author
Deepanshu Gupta
<deepanshu@google.com>
Thu, 4 Sep 2014 06:16:36 +0000
(06:16 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 4 Sep 2014 06:16:36 +0000
(06:16 +0000)
* commit '
2d70a5a9d1556f269b8ed79b1f6a896ce8241b51
':
Resolve color xml attributes properly. [DO NOT MERGE]
Trivial merge