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
resolved conflicts for merge of 21938749 to jb-mr1-dev
2012-08-20
Jean-Baptiste Queru
resolved conflicts for merge of 21938749 to jb-mr1-dev
commit
|
commitdiff
|
tree
2012-06-25
Johannes Carlsson
Fix shutdown sequence to avoid SIGSEGV when running...
commit
|
commitdiff
|
tree
2012-06-08
Magnus Strandberg
Aligning native Parcel implementation to Java.
commit
|
commitdiff
|
tree
2012-02-27
Jean-Baptiste Queru
Add stubs for better compatibility
commit
|
commitdiff
|
tree
2012-02-14
Jean-Baptiste Queru
Merge from master
commit
|
commitdiff
|
tree
2012-02-14
Jean-Baptiste Queru
Merge from master
commit
|
commitdiff
|
tree
2012-02-14
Jean-Baptiste Queru
Merge from master
commit
|
commitdiff
|
tree
2012-01-20
Jean-Baptiste Queru
Merge ee4618bc
commit
|
commitdiff
|
tree
2012-01-19
Steve Block
Rename LOG_ASSERT to ALOG_ASSERT
commit
|
commitdiff
|
tree
2012-01-19
Steve Block
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
commit
|
commitdiff
|
tree
2012-01-19
Steve Block
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
commit
|
commitdiff
|
tree
2012-01-19
Steve Block
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
commit
|
commitdiff
|
tree
2012-01-19
Steve Block
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
commit
|
commitdiff
|
tree
2012-01-19
Steve Block
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
commit
|
commitdiff
|
tree
2011-11-22
Jean-Baptiste Queru
Ignore e36657e5
commit
|
commitdiff
|
tree
2011-09-12
Jean-Baptiste Queru
Ignore e4f0da70 from gingerbread-plus-aosp
commit
|
commitdiff
|
tree
2011-08-11
Jean-Baptiste Queru
Add missing include
commit
|
commitdiff
|
tree
2011-08-02
Teng-Hui Zhu
Fix a compiling error when trying to use setBufferCount
commit
|
commitdiff
|
tree
2011-07-07
Jean-Baptiste Queru
Merge 37dbfcaf
commit
|
commitdiff
|
tree
2011-06-24
Jean-Baptiste Queru
Tweak for forward-compatibility
commit
|
commitdiff
|
tree
2011-06-18
Jean-Baptiste Queru
Tweaks for forward-compatibility
commit
|
commitdiff
|
tree
2011-06-16
Jean-Baptiste Queru
Merge f28f1de3 - regen current.txt
commit
|
commitdiff
|
tree
2011-06-15
Jean-Baptiste Queru
Merge 5137711109783dcbb20143d3e5cab2fa931218dd
commit
|
commitdiff
|
tree
2011-06-13
Jean-Baptiste Queru
Merge/Ignore 653fd9cf
commit
|
commitdiff
|
tree
2011-05-19
Jean-Baptiste Queru
Merge c41aefe1
commit
|
commitdiff
|
tree
2011-05-19
Jean-Baptiste Queru
Merge 111d17ce
commit
|
commitdiff
|
tree
2011-05-18
Jean-Baptiste Queru
Merge 4b999030
commit
|
commitdiff
|
tree
2011-05-13
Jean-Baptiste Queru
Merge from honeycomb-plus-aosp
commit
|
commitdiff
|
tree
2011-05-13
Jean-Baptiste Queru
Merge from honeycomb-plus-aosp
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
next