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:
70dbeac
4586b0d
)
am 3966c960: Merge "Add defaults for caption colors and edge type" into lmp-preview-dev
author
Alan Viverette
<alanv@google.com>
Thu, 5 Jun 2014 21:00:32 +0000
(21:00 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 5 Jun 2014 21:00:32 +0000
(21:00 +0000)
* commit '
3966c9604e55c9183a6d1ba8b3540add3be4434f
':
Add defaults for caption colors and edge type
1
2
api/current.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
api/current.txt
Simple merge