Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "deleted ScoSocket.java and android_bluetooth_ScoSocket.cpp" | Danica Chang | 2010-07-20 | 2 | -895/+0 |
|\ | |||||
| * | deleted ScoSocket.java and android_bluetooth_ScoSocket.cpp | Danica Chang | 2010-06-15 | 2 | -895/+0 |
* | | Merge "Use software encoder for time lapse capture." | Nipun Kwatra | 2010-07-20 | 1 | -1/+3 |
|\ \ | |||||
| * | | Use software encoder for time lapse capture. | Nipun Kwatra | 2010-07-20 | 1 | -1/+3 |
* | | | Merge "Action bar context mode support for overflow, submenus" | Adam Powell | 2010-07-20 | 2 | -54/+45 |
|\ \ \ | |/ / |/| | | |||||
| * | | Action bar context mode support for overflow, submenus | Adam Powell | 2010-07-20 | 2 | -54/+45 |
* | | | Merge "Adding support for timelapse capture using still camera's takepicture.... | Nipun Kwatra | 2010-07-20 | 6 | -82/+412 |
|\ \ \ | |||||
| * | | | Adding support for timelapse capture using still camera's takepicture. | Nipun Kwatra | 2010-07-19 | 6 | -82/+412 |
* | | | | Merge "Fixing potential buffer overrun errors." | Alex Sakhartchouk | 2010-07-20 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | Fixing potential buffer overrun errors. | Alex Sakhartchouk | 2010-07-20 | 1 | -0/+4 |
* | | | | | am ff45709f: am cc14a839: Support a single format change at the beginning of ... | Andreas Huber | 2010-07-20 | 3 | -67/+64 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | am cc14a839: Support a single format change at the beginning of audio playbac... | Andreas Huber | 2010-07-20 | 3 | -67/+64 |
| |\ \ \ \ \ | |||||
| | * | | | | | Support a single format change at the beginning of audio playback. This way t... | Andreas Huber | 2010-07-20 | 3 | -67/+64 |
* | | | | | | | resolved conflicts for merge of ca48433a to master | Jean-Baptiste Queru | 2010-07-20 | 2 | -9/+12 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | merge from open-source master | The Android Open Source Project | 2010-07-20 | 3 | -10/+14 |
| |\ \ \ \ \ | |||||
| | * | | | | | Replaced /sdcard with Environment.getExternalStorageDirectory() | Christian Mehlmauer | 2010-07-19 | 3 | -10/+14 |
* | | | | | | | am fcff6910: merge from open-source master | The Android Open Source Project | 2010-07-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | |||||
| * | | | | | merge from open-source master | The Android Open Source Project | 2010-07-20 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | typo fixed | Madan Ankapura | 2010-07-19 | 1 | -1/+1 |
* | | | | | | Merge "Fix bugs in Sequencer" | Chet Haase | 2010-07-20 | 2 | -26/+38 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix bugs in Sequencer | Chet Haase | 2010-07-19 | 2 | -26/+38 |
* | | | | | | | am 4df3ab54: am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequ... | Andreas Huber | 2010-07-20 | 2 | -13/+79 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctl... | Andreas Huber | 2010-07-20 | 2 | -13/+79 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is... | Andreas Huber | 2010-07-20 | 2 | -13/+79 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled. | James Dong | 2010-07-19 | 2 | -13/+79 |
* | | | | | | | | Merge "MTP host fixes:" | Mike Lockwood | 2010-07-20 | 2 | -39/+53 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | MTP host fixes: | Mike Lockwood | 2010-07-20 | 2 | -39/+53 |
* | | | | | | | | | Fix sim-eng build. | Andy McFadden | 2010-07-20 | 1 | -2/+2 |
|/ / / / / / / / | |||||
* | | | | | | | | MTP: Remove race condition in initial device enumeration for host mode. | Mike Lockwood | 2010-07-20 | 2 | -11/+31 |
* | | | | | | | | MTP: Fix problems reading and writing arrays in property values. | Mike Lockwood | 2010-07-20 | 3 | -6/+39 |
* | | | | | | | | MTP: add Linux host library for MTP/PTP host support. | Mike Lockwood | 2010-07-20 | 2 | -0/+32 |
* | | | | | | | | Merge "Fix Android build" | Shih-wei Liao | 2010-07-20 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix Android build | Shih-wei Liao | 2010-07-20 | 1 | -0/+4 |
* | | | | | | | | | Merge "Change the include path." | Shih-wei Liao | 2010-07-20 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Change the include path. | Shih-wei Liao | 2010-07-20 | 1 | -3/+3 |
* | | | | | | | | | Merge "Port ModelViewer to use the new build system. Fix the simulator build ... | Shih-wei Liao | 2010-07-20 | 6 | -120/+10 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Port ModelViewer to use the new build system. | Shih-wei Liao | 2010-07-20 | 6 | -120/+10 |
* | | | | | | | | | Switch back to use the default search of include path | Ying Wang | 2010-07-19 | 1 | -3/+3 |
|/ / / / / / / / | |||||
* | | | | | | | | Add support for linear gradients. | Romain Guy | 2010-07-19 | 12 | -22/+374 |
* | | | | | | | | Merge "Fix build" | Ying Wang | 2010-07-19 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix build | Ying Wang | 2010-07-19 | 1 | -3/+3 |
* | | | | | | | | | Merge "Replace try-catch code by proper type checking. Saves an exception for... | Daniel Lehmann | 2010-07-19 | 1 | -19/+12 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Replace try-catch code by proper type checking. Saves an exception for each b... | Daniel Lehmann | 2010-07-19 | 1 | -19/+12 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge "Fix extraMath state variable." | Jack Palevich | 2010-07-19 | 1 | -7/+11 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix extraMath state variable. | Jack Palevich | 2010-07-19 | 1 | -7/+11 |
* | | | | | | | | | Merge ".rs files are now built by the build system." | Ying Wang | 2010-07-19 | 6 | -152/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | .rs files are now built by the build system. | Ying Wang | 2010-07-19 | 6 | -152/+5 |
* | | | | | | | | | | Merge "Try to handle end-of-application better." | Jack Palevich | 2010-07-19 | 1 | -16/+25 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Try to handle end-of-application better. | Jack Palevich | 2010-07-19 | 1 | -16/+25 |
* | | | | | | | | | | Merge "Write test timings to /sdcard/glperf.csv" | Jack Palevich | 2010-07-19 | 2 | -3/+22 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |