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:
64e648f
4aa7e0a
)
am 4aa7e0aa: am d6af2e0c: (-s ours) Merge change I43a335c3 into eclair
author
Brett Chabot
<brettchabot@android.com>
Tue, 3 Nov 2009 01:20:30 +0000
(17:20 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 3 Nov 2009 01:20:30 +0000
(17:20 -0800)
Merge commit '
4aa7e0aae14d2f05afb85bc1e0a7d523ebcb3da7
' into eclair-mr2-plus-aosp
* commit '
4aa7e0aae14d2f05afb85bc1e0a7d523ebcb3da7
':
Suppress takePicture test from continuous DO NOT MERGE.
Trivial merge