OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge/Ignore 653fd9cf
2011-06-13
Jean-Baptiste Queru
Merge/Ignore 653fd9cf
commit
|
commitdiff
|
tree
2011-05-18
Jean-Baptiste Queru
Merge 4b999030
commit
|
commitdiff
|
tree
2011-04-01
Jean-Baptiste Queru
ignore from gingerbread-plus-aosp
commit
|
commitdiff
|
tree
2011-03-29
Jean-Baptiste Queru
No-op - reconcile with open-source gingerbread
commit
|
commitdiff
|
tree
2011-02-11
Steve Block
stubs
commit
|
commitdiff
|
tree
2011-02-10
Jean-Baptiste Queru
Ignore a8d3f02a from honeycomb - already there
commit
|
commitdiff
|
tree
2011-02-03
Jean-Baptiste Queru
Merge from gingerbread
commit
|
commitdiff
|
tree
2011-02-03
Jean-Baptiste Queru
Merge 917d9ea1
commit
|
commitdiff
|
tree
2011-02-03
Jean-Baptiste Queru
Merge from open-source gingerbread
commit
|
commitdiff
|
tree
2011-02-03
Jean-Baptiste Queru
Merge from gingerbread
commit
|
commitdiff
|
tree
2011-02-03
Jean-Baptiste Queru
Merge ee4c17ee from gingerbread
commit
|
commitdiff
|
tree
2011-02-03
Jean-Baptiste Queru
Merge from open-source gingerbread
commit
|
commitdiff
|
tree
2011-02-02
Jean-Baptiste Queru
Merge from gingerbread
commit
|
commitdiff
|
tree
2011-02-02
Jean-Baptiste Queru
Merge from open-source gingerbread
commit
|
commitdiff
|
tree
2011-02-01
Jean-Baptiste Queru
Merge da20efd9
commit
|
commitdiff
|
tree
2011-01-30
Jean-Baptiste Queru
Merge from gingerbread
commit
|
commitdiff
|
tree
2011-01-30
Jean-Baptiste Queru
Merge from open-source gingerbread
commit
|
commitdiff
|
tree
2011-01-29
Jean-Baptiste Queru
Merge 3100207b from gingerbread-plus-aosp
commit
|
commitdiff
|
tree
2011-01-29
Jean-Baptiste Queru
Merge 6b739dc7 from gingerbread
commit
|
commitdiff
|
tree
2011-01-29
Jean-Baptiste Queru
Merge 0ef57993 from gingerbread
commit
|
commitdiff
|
tree
2011-01-29
Jean-Baptiste Queru
Merge d350dc04 from gingerbread
commit
|
commitdiff
|
tree
2011-01-29
Jean-Baptiste Queru
Merge eab0e97b from gingerbread
commit
|
commitdiff
|
tree
2011-01-29
Jean-Baptiste Queru
Merge ba3dd323 from gingerbread
commit
|
commitdiff
|
tree
2011-01-29
Jean-Baptiste Queru
Merge c33acae9 from gingerbread
commit
|
commitdiff
|
tree
2011-01-29
Jean-Baptiste Queru
Merge f126ad3b from gingerbread
commit
|
commitdiff
|
tree
2011-01-29
Jean-Baptiste Queru
Merge 13212f83 from gingerbread-plus-aosp
commit
|
commitdiff
|
tree
2011-01-29
Jean-Baptiste Queru
Merge 34afc2cd from gingerbread-plus-aosp
commit
|
commitdiff
|
tree
2011-01-29
Jean-Baptiste Queru
Merge 55e124c4 from gingerbread-plus-aosp
commit
|
commitdiff
|
tree
2011-01-29
Jean-Baptiste Queru
Merge c896d85c from gingerbread
commit
|
commitdiff
|
tree
2011-01-29
Jean-Baptiste Queru
Merge da01b4ab from gingerbread
commit
|
commitdiff
|
tree
2011-01-29
Jean-Baptiste Queru
stubs
commit
|
commitdiff
|
tree
2011-01-15
Jean-Baptiste Queru
merge 83fdc69e from gingerbread - do not merge
commit
|
commitdiff
|
tree
2010-12-13
Jean-Baptiste Queru
resolved conflicts for merge of 4b94c451 to stage-korg...
commit
|
commitdiff
|
tree
2010-12-09
Jean-Baptiste Queru
reconcile with open-source gingerbread
commit
|
commitdiff
|
tree
2010-12-09
Jean-Baptiste Queru
merge from gingerbread
commit
|
commitdiff
|
tree
2010-12-07
Jean-Baptiste Queru
resolved conflicts for merge of ee27dd35 to master
commit
|
commitdiff
|
tree
2010-12-07
Jean-Baptiste Queru
resolved conflicts for merge of 78742e01 to stage-korg...
commit
|
commitdiff
|
tree
2010-12-06
Jean-Baptiste Queru
Merge from gingerbread-plus-aosp
commit
|
commitdiff
|
tree
2010-12-06
Jean-Baptiste Queru
Merge from gingerbread-plus-aosp
commit
|
commitdiff
|
tree
2010-12-02
Jean-Baptiste Queru
resolved conflicts for merge of bf1439c5 to stage-korg...
commit
|
commitdiff
|
tree
2010-12-02
Jean-Baptiste Queru
Merge from open-source master
commit
|
commitdiff
|
tree
2010-12-02
Jean-Baptiste Queru
Merge from open-source master
commit
|
commitdiff
|
tree
2010-11-23
Jean-Baptiste Queru
resolved conflicts for merge of 8484e57f to master
commit
|
commitdiff
|
tree
2010-11-23
Jean-Baptiste Queru
resolved conflicts for merge of e4ae7fc3 to gingerbread...
commit
|
commitdiff
|
tree
2010-11-20
Jean-Baptiste Queru
resolved conflicts for merge of e2ec61b2 to gingerbread...
commit
|
commitdiff
|
tree
2010-11-18
Jean-Baptiste Queru
resolved conflicts for merge of 1a2344b8 to master
commit
|
commitdiff
|
tree
2010-11-18
Jean-Baptiste Queru
resolved conflicts for merge of 8fc378f9 to gingerbread...
commit
|
commitdiff
|
tree
2010-11-05
Jean-Baptiste Queru
Merge db2403ff from open-source master
commit
|
commitdiff
|
tree
2010-11-04
Jean-Baptiste Queru
Merge 42c94791 from open-source master
commit
|
commitdiff
|
tree
2010-10-26
Jean-Baptiste Queru
resolved conflicts for merge of b4ae2f1b to gingerbread...
commit
|
commitdiff
|
tree
2010-10-24
Jean-Baptiste Queru
Ignore b04e3940 from gingerbread-plus-aosp - already...
commit
|
commitdiff
|
tree
2010-10-22
Jean-Baptiste Queru
Merge de8635e4 from gingerbread-plus-aosp
commit
|
commitdiff
|
tree
2010-10-21
Jean-Baptiste Queru
resolved conflicts for merge of 5d919b43 to gingerbread...
commit
|
commitdiff
|
tree
2010-10-19
David Deephanphongs
Add missing NOTICE entries.
commit
|
commitdiff
|
tree
2010-10-19
Jean-Baptiste Queru
Skip 494ec19e from gingerbread-plus-aosp (already cherry...
commit
|
commitdiff
|
tree
2010-10-19
Jean-Baptiste Queru
Skip 69a19fdb from gingerbread-plsu-aosp - already...
commit
|
commitdiff
|
tree
2010-10-18
Jean-Baptiste Queru
Merge fb474872 from gingerbread-plus-aosp
commit
|
commitdiff
|
tree
2010-10-16
Jean-Baptiste Queru
Merge a851d8d0 from gingerbread
commit
|
commitdiff
|
tree
2010-10-13
Jean-Baptiste Queru
ignore - a similar change already exists
commit
|
commitdiff
|
tree
2010-10-12
Jean-Baptiste Queru
resolved conflicts for merge of e69f1f1a to master
commit
|
commitdiff
|
tree
2010-10-11
Jean-Baptiste Queru
resolved conflicts for merge of e3cfd35b to gingerbread...
commit
|
commitdiff
|
tree
2010-10-11
Jean-Baptiste Queru
resolved conflicts for merge of 7c08b70c to master
commit
|
commitdiff
|
tree
2010-10-11
Jean-Baptiste Queru
resolved conflicts for merge of c2894474 to gingerbread...
commit
|
commitdiff
|
tree
2010-10-10
Jean-Baptiste Queru
resolved conflicts for merge of 5df4b5a7 to master
commit
|
commitdiff
|
tree
2010-10-07
Gloria Wang
resolved conflicts for merge of e6ad0e47 to gingerbread...
commit
|
commitdiff
|
tree
2010-09-27
Jean-Baptiste Queru
reconcile froyo-release into gingerbread
commit
|
commitdiff
|
tree
2010-09-12
Jean-Baptiste Queru
resolved conflicts for merge of 01937f63 to gingerbread...
commit
|
commitdiff
|
tree
2010-09-10
Jean-Baptiste Queru
resolved conflicts for merge of 56aa3c76 to gingerbread...
commit
|
commitdiff
|
tree
2010-09-08
Jean-Baptiste Queru
resolve conflicts
commit
|
commitdiff
|
tree
2010-09-02
Jean-Baptiste Queru
resolved conflicts for merge of bd6abed3 to gingerbread...
commit
|
commitdiff
|
tree
2010-08-31
Jean-Baptiste Queru
Ignore changes from open-source master that are already...
commit
|
commitdiff
|
tree
2010-08-30
Jean-Baptiste Queru
resolved conflicts for merge of ff749b9a to master
commit
|
commitdiff
|
tree
2010-08-25
Jean-Baptiste Queru
reconcile open-source froyo into google variant
commit
|
commitdiff
|
tree
2010-08-24
Jean-Baptiste Queru
resolved conflicts for merge of c64b916e to master
commit
|
commitdiff
|
tree
2010-08-24
Jean-Baptiste Queru
merge -s ours from froyo-release so that upgrading...
commit
|
commitdiff
|
tree
2010-08-23
Jean-Baptiste Queru
resolved conflicts for merge of 1ffd753e to gingerbread...
commit
|
commitdiff
|
tree
2010-08-23
Sean McNeil
Only monitor recognized uevent devices.
commit
|
commitdiff
|
tree
2010-08-21
Jean-Baptiste Queru
resolved conflicts for merge of e7731f0a to gingerbread...
commit
|
commitdiff
|
tree
2010-08-21
Jean-Baptiste Queru
resolved conflicts for merge of 691be97f to gingerbread...
commit
|
commitdiff
|
tree
2010-08-20
Jean-Baptiste Queru
manual merge
commit
|
commitdiff
|
tree
2010-08-20
Jean-Baptiste Queru
resolved conflicts for merge of 34df5ccc to master
commit
|
commitdiff
|
tree
2010-08-18
Sean McNeil
Only monitor recognized uevent devices.
commit
|
commitdiff
|
tree
2010-08-18
Jean-Baptiste Queru
DO NOT MERGE resolved conflicts for merge of 8c11e952...
commit
|
commitdiff
|
tree
2010-08-18
Jens Gulin
Keep track of remaining fd when devices are removed
commit
|
commitdiff
|
tree
2010-08-17
Jean-Baptiste Queru
resolved conflicts for merge of 0b7bd95d to gingerbread...
commit
|
commitdiff
|
tree
2010-08-17
Jean-Baptiste Queru
resolved conflicts for merge of be50507b to gingerbread...
commit
|
commitdiff
|
tree
2010-08-17
Jean-Baptiste Queru
resolved conflicts for merge of bcbb5845 to gingerbread...
commit
|
commitdiff
|
tree
2010-08-13
Jean-Baptiste Queru
Ignore 87624778
commit
|
commitdiff
|
tree
2010-08-11
Jean-Baptiste Queru
resolved conflicts for merge of efcac2ff to gingerbread...
commit
|
commitdiff
|
tree
2010-07-30
Jean-Baptiste Queru
resolved conflicts for merge of 27eecb70 to gingerbread
commit
|
commitdiff
|
tree
2010-07-30
Jamie Gennis
Fix a bug that prevented the creation of EGL shared...
commit
|
commitdiff
|
tree
2010-07-30
Jean-Baptiste Queru
fix inaccurate copyrights
commit
|
commitdiff
|
tree
2010-07-29
Jean-Baptiste Queru
resolved conflicts for merge of 8a76a908 to master
commit
|
commitdiff
|
tree
2010-07-26
Jean-Baptiste Queru
resolved conflicts for merge of b237bdb6 to gingerbread...
commit
|
commitdiff
|
tree
2010-07-23
Jean-Baptiste Queru
resolved conflicts for merge of a9b1e01a to gingerbread...
commit
|
commitdiff
|
tree
2010-07-22
Mathias Agopian
move native services under services/
commit
|
commitdiff
|
tree
2010-07-20
Jean-Baptiste Queru
resolved conflicts for merge of ca48433a to master
commit
|
commitdiff
|
tree
2010-07-02
Jean-Baptiste Queru
resolved conflicts for merge of f601ce2c to master
commit
|
commitdiff
|
tree
2010-06-21
Jean-Baptiste Queru
Recover a handful of commits that were reverted earlier
commit
|
commitdiff
|
tree
2010-06-21
Jean-Baptiste Queru
Undo previous merge
commit
|
commitdiff
|
tree
next