OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track"...
[android-x86/frameworks-av.git]
/
camera
/
ICameraClient.cpp
2012-03-28
Anatol Pomozov
Merge media files with history from frameworks/base.git
blob
|
commitdiff
2012-03-22
Mike Lockwood
Merge remote-tracking branch 'goog/ics-aah-exp' into...
blob
|
commitdiff
2012-03-21
The Android Open...
am 98e1b541: Reconcile with ics-mr1-release
blob
|
commitdiff
2012-03-21
The Android Open...
Reconcile with ics-mr1-release
blob
|
commitdiff
2012-03-19
Eric Laurent
am cbc90453: am 14958e21: Merge "audioflinger: fix...
blob
|
commitdiff
2012-03-19
Eric Laurent
am 14958e21: Merge "audioflinger: fix issue with camcor...
blob
|
commitdiff
2012-03-17
Eric Laurent
am b1853f70: am 2a0d685e: Merge "MediaPlayerService...
blob
|
commitdiff
2012-03-17
Eric Laurent
am 2a0d685e: Merge "MediaPlayerService: fix AudioSink...
blob
|
commitdiff
2012-03-17
Eric Laurent
resolved conflicts for merge of 393dd03e to ics-scoop...
blob
|
commitdiff
2012-03-17
Eric Laurent
resolved conflicts for merge of 3fe7ee65 to ics-mr1...
blob
|
commitdiff
2012-03-06
Dirk Dougherty
am 859717ad: am 4d7bc655: Doc change: String changes...
blob
|
commitdiff
2012-03-06
Dirk Dougherty
am 4d7bc655: Doc change: String changes for Android...
blob
|
commitdiff
2012-02-29
Jean-Baptiste Queru
Merge changes I46c81dba,If1f40e9c,I652eaaa5
blob
|
commitdiff
2012-02-29
Jean-Baptiste Queru
Merge "stagefright aacenc: Safeguard against overwritin...
blob
|
commitdiff
2012-02-27
Jean-Baptiste Queru
Merge "stagefright aacenc: Simplify the definition...
blob
|
commitdiff
2012-02-27
Jean-Baptiste Queru
Merge "stagefright aacenc: Don't address a Word32 with...
blob
|
commitdiff
2012-02-24
Jean-Baptiste Queru
Merge "stagefright aacenc: Make the bits to write in...
blob
|
commitdiff
2012-02-24
Jean-Baptiste Queru
Merge "stagefright aacenc: Fix an inline asm constraint"
blob
|
commitdiff
2012-02-24
Jean-Baptiste Queru
Merge changes I903353c5,I822dcc74
blob
|
commitdiff
2012-02-24
Jean-Baptiste Queru
Merge "stagefright aacenc: Zero-initialize a struct"
blob
|
commitdiff
2012-02-24
Jean-Baptiste Queru
Merge "stagefright aacenc: Add const declarations to...
blob
|
commitdiff
2012-02-24
Jean-Baptiste Queru
Merge "stagefright aacenc: Fix inline asm"
blob
|
commitdiff
2012-02-24
Jean-Baptiste Queru
Merge "stagefright aacenc: Fix inline asm constraints"
blob
|
commitdiff
2012-01-30
The Android Open...
Reconcile with ics-mr1-release
blob
|
commitdiff
2012-01-25
Jean-Baptiste Queru
Merge "stagefright aacenc: Fix type definitions for...
blob
|
commitdiff
2012-01-24
Jean-Baptiste Queru
Merge "stagefright amrwbenc: Make the mem_malloc functi...
blob
|
commitdiff
2012-01-24
Eric Laurent
am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep...
blob
|
commitdiff
2012-01-24
Eric Laurent
am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioF...
blob
|
commitdiff
2012-01-24
Jean-Baptiste Queru
Merge "stagefright aacenc: Add missing newlines at...
blob
|
commitdiff
2012-01-24
Jean-Baptiste Queru
Merge "stagefright aacenc: Properly terminate a comment"
blob
|
commitdiff
2012-01-23
Justin Ho
am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger...
blob
|
commitdiff
2012-01-20
The Android Open...
am 5d0c713a: Reconcile with ics-mr1-release
blob
|
commitdiff
2012-01-20
Jean-Baptiste Queru
Merge ee4618bc
blob
|
commitdiff
2012-01-19
Steve Block
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
blob
|
commitdiff
2012-01-19
Eric Laurent
resolved conflicts for merge of 05683c85 to master
blob
|
commitdiff
2012-01-13
Jean-Baptiste Queru
am c0ef548c: am d75961ee: am b4cee0f8: Merge "stagefrig...
blob
|
commitdiff
2012-01-12
The Android Open...
am ce77af47: Reconcile with ics-mr1-release
blob
|
commitdiff
2012-01-11
Eric Laurent
am 05985a2e: am c15cf3d2: Merge "stagefright: limit...
blob
|
commitdiff
2012-01-07
The Android Open...
am 20090b30: Reconcile with ics-mr1-release
blob
|
commitdiff
2012-01-06
Eino-Ville Talvala
am 4bc873e6: am 7944704e: Merge "Switch camera sounds...
blob
|
commitdiff
2012-01-05
The Android Open...
am d32ee5ba: Reconcile with ics-mr1-release
blob
|
commitdiff
2012-01-05
Eric Laurent
resolved conflicts for merge of 1a4b9939 to master
blob
|
commitdiff
2011-12-20
The Android Open...
am 21cb1290: Reconcile with ics-mr1-release
blob
|
commitdiff
2011-12-16
The Android Open...
am 57ea96a4: Reconcile with ics-mr1-release
blob
|
commitdiff
2011-12-16
Dave Burke
am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource...
blob
|
commitdiff
2011-12-15
The Android Open...
am b14436d0: Reconcile with ics-mr1-release
blob
|
commitdiff
2011-12-14
James Dong
am 3f6a7d1e: am d70c64db: Revert the following patches...
blob
|
commitdiff
2011-12-14
The Android Open...
am 16bdd1e6: Reconcile with ics-mr1-release
blob
|
commitdiff
2011-12-13
Andreas Huber
am 22e50edd: (-s ours) am 3ab63008: Merge "DO NOT MERGE...
blob
|
commitdiff
2011-12-13
The Android Open...
am da296533: Reconcile with ics-mr1-release
blob
|
commitdiff
2011-12-12
The Android Open...
am 40375099: Reconcile with ics-mr1-release
blob
|
commitdiff
2011-12-12
The Android Open...
am f14dc291: Merge from ics-mr1
blob
|
commitdiff
2011-12-12
Jeff Tinker
am dc44e06e: am ef664f62: Merge "Fix drm flag setting...
blob
|
commitdiff
2011-12-12
The Android Open...
am 175d5d76: Reconcile with ics-mr1-release
blob
|
commitdiff
2011-12-12
James Dong
am 406dd5d1: am aadbd80b: Fixed the false drm recognition.
blob
|
commitdiff
2011-12-10
Andreas Huber
am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP...
blob
|
commitdiff
2011-12-10
Andreas Huber
am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits...
blob
|
commitdiff
2011-12-09
The Android Open...
am 54854d31: Reconcile with ics-mr0-release ics-mr1...
blob
|
commitdiff
2011-12-09
Jeff Tinker
am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevi...
blob
|
commitdiff
2011-12-07
Dave Burke
am 6727a43f: am 54a53841: Merge "Fetch at least 192KB...
blob
|
commitdiff
2011-12-07
The Android Open...
Reconcile with ics-mr1-release
blob
|
commitdiff
2011-12-07
The Android Open...
am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with...
blob
|
commitdiff
2011-12-07
Andreas Huber
am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit...
blob
|
commitdiff
2011-12-07
James Dong
am 49782b81: (-s ours) am 6b8b5a0a: Merge "DO NOT MERGE...
blob
|
commitdiff
2011-12-07
Andreas Huber
am c4738293: (-s ours) am 05d63069: Merge "DO NOT MERGE...
blob
|
commitdiff
2011-12-06
The Android Open...
Reconcile with ics-mr1-release
blob
|
commitdiff
2011-12-06
Eric Laurent
am 5433e25f: am 7b6aff23: Merge "audioflinger: fix...
blob
|
commitdiff
2011-12-05
Andreas Huber
resolved conflicts for merge of 07bacabe to master
blob
|
commitdiff
2011-12-05
The Android Open...
Reconcile with ics-mr1-release
blob
|
commitdiff
2011-12-03
Mike Lockwood
am 9f3f3c2f: (-s ours) am 1a3ece9f: Merge "MTP: Add...
blob
|
commitdiff
2011-12-03
Mike Lockwood
am 7bbc3c4b: (-s ours) am 7f87d9cf: Merge "MTP: Don...
blob
|
commitdiff
2011-12-02
The Android Open...
Reconcile with ics-mr1-release
blob
|
commitdiff
2011-12-01
Andreas Huber
am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExt...
blob
|
commitdiff
2011-11-30
The Android Open...
Reconcile with ics-mr1-release
blob
|
commitdiff
2011-11-30
Jamie Gennis
am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource...
blob
|
commitdiff
2011-11-30
Andreas Huber
resolved conflicts for merge of 3d630e86 to master
blob
|
commitdiff
2011-11-30
Andreas Huber
am 52607c53: am d12dc284: Merge "If an error occurs...
blob
|
commitdiff
2011-11-30
Andreas Huber
am 074133b2: am 351143fb: Merge "Updated (internal...
blob
|
commitdiff
2011-11-29
Andreas Huber
resolved conflicts for merge of 998a929a to master
blob
|
commitdiff
2011-11-23
Eric Laurent
am f6422f5f: am 20398fac: Merge "audioflinger: reduce...
blob
|
commitdiff
2011-11-22
The Android Open...
Reconcile with ics-mr0-release ics-mr1-release
blob
|
commitdiff
2011-11-22
Andreas Huber
am 31626b30: am cb6fbc89: Merge "Report a runtime error...
blob
|
commitdiff
2011-11-22
James Dong
am d0a25456: am 02740dc4: Merge "Fix log spamming durin...
blob
|
commitdiff
2011-11-18
The Android Open...
Reconcile with ics-mr0-release ics-mr1-release
blob
|
commitdiff
2011-11-18
Marco Nelissen
am a1cd09e0: am 7ff7821a: am d4b22ab4: status_t !=...
blob
|
commitdiff
2011-11-17
Andreas Huber
am 624efe45: am c1b1709b: Merge "Make sure not to cance...
blob
|
commitdiff
2011-11-17
The Android Open...
am 4dce941e: am 816e68e2: No-op merge from ics-mr0
blob
|
commitdiff
2011-11-15
Hong Teng
am 716747f7: am 481ffa50: Merge "Fix for issue 5309336...
blob
|
commitdiff
2011-11-14
Eric Laurent
am 25924f8f: am 030bb998: Merge "audioflinger: fix...
blob
|
commitdiff
2011-11-11
Andreas Huber
am 8a065423: am 23217182: Merge "Didn\'t mean to check...
blob
|
commitdiff
2011-11-11
Eric Laurent
am 2c29a5cf: am 1f8c6212: Merge "visualizer: reset...
blob
|
commitdiff
2011-11-11
Andreas Huber
am 40461ee7: am cd556b82: Merge "Instead of asserting...
blob
|
commitdiff
2011-11-11
Andreas Huber
am 9a87a838: (-s ours) am 5d42075e: Merge "DO NOT MERGE...
blob
|
commitdiff
2011-11-11
Andreas Huber
am 9c981cd3: am d9f25bc9: Merge "Disconnect on socket...
blob
|
commitdiff
2011-11-11
James Dong
am 510180f1: am 08e42967: Merge "Add support for retrie...
blob
|
commitdiff
2011-11-10
The Android Open...
Reconcile with ics-mr1-release
blob
|
commitdiff
2011-11-10
Andreas Huber
am 9e2949c6: am 2375d163: Merge "Send RTSP control...
blob
|
commitdiff
2011-11-10
Andreas Huber
am 2dff5cdc: am b42aea5b: Merge "Don\'t believe the...
blob
|
commitdiff
2011-11-10
Andreas Huber
am ec04f4ac: am 7c063cf9: Merge "There\'s no point...
blob
|
commitdiff
2011-11-10
Glenn Kasten
am 874641f1: am f2c2b1c4: am 19998120: Merge "Bug 54780...
blob
|
commitdiff
next