OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f440828
4261ace
)
am 4261ace0: resolved conflicts for merge of 9f312b81 to jb-dev-plus-aosp
author
Jean-Baptiste Queru
<jbq@google.com>
Fri, 25 May 2012 14:35:53 +0000
(07:35 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 25 May 2012 14:35:53 +0000
(07:35 -0700)
* commit '
4261ace0139d7bb864d002d7a65be66945ec8878
':
Enable DRM support in the SDK system image
Trivial merge