summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "deleted ScoSocket.java and android_bluetooth_ScoSocket.cpp"Danica Chang2010-07-202-895/+0
|\
| * deleted ScoSocket.java and android_bluetooth_ScoSocket.cppDanica Chang2010-06-152-895/+0
* | Merge "Use software encoder for time lapse capture."Nipun Kwatra2010-07-201-1/+3
|\ \
| * | Use software encoder for time lapse capture.Nipun Kwatra2010-07-201-1/+3
* | | Merge "Action bar context mode support for overflow, submenus"Adam Powell2010-07-202-54/+45
|\ \ \ | |/ / |/| |
| * | Action bar context mode support for overflow, submenusAdam Powell2010-07-202-54/+45
* | | Merge "Adding support for timelapse capture using still camera's takepicture....Nipun Kwatra2010-07-206-82/+412
|\ \ \
| * | | Adding support for timelapse capture using still camera's takepicture.Nipun Kwatra2010-07-196-82/+412
* | | | Merge "Fixing potential buffer overrun errors."Alex Sakhartchouk2010-07-201-0/+4
|\ \ \ \
| * | | | Fixing potential buffer overrun errors.Alex Sakhartchouk2010-07-201-0/+4
* | | | | am ff45709f: am cc14a839: Support a single format change at the beginning of ...Andreas Huber2010-07-203-67/+64
|\ \ \ \ \
| * \ \ \ \ am cc14a839: Support a single format change at the beginning of audio playbac...Andreas Huber2010-07-203-67/+64
| |\ \ \ \ \
| | * | | | | Support a single format change at the beginning of audio playback. This way t...Andreas Huber2010-07-203-67/+64
* | | | | | | resolved conflicts for merge of ca48433a to masterJean-Baptiste Queru2010-07-202-9/+12
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | merge from open-source masterThe Android Open Source Project2010-07-203-10/+14
| |\ \ \ \ \
| | * | | | | Replaced /sdcard with Environment.getExternalStorageDirectory()Christian Mehlmauer2010-07-193-10/+14
* | | | | | | am fcff6910: merge from open-source masterThe Android Open Source Project2010-07-201-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | merge from open-source masterThe Android Open Source Project2010-07-201-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | typo fixedMadan Ankapura2010-07-191-1/+1
* | | | | | Merge "Fix bugs in Sequencer"Chet Haase2010-07-202-26/+38
|\ \ \ \ \ \
| * | | | | | Fix bugs in SequencerChet Haase2010-07-192-26/+38
* | | | | | | am 4df3ab54: am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequ...Andreas Huber2010-07-202-13/+79
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctl...Andreas Huber2010-07-202-13/+79
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is...Andreas Huber2010-07-202-13/+79
| | |\ \ \ \ \
| | | * | | | | Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.James Dong2010-07-192-13/+79
* | | | | | | | Merge "MTP host fixes:"Mike Lockwood2010-07-202-39/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | MTP host fixes:Mike Lockwood2010-07-202-39/+53
* | | | | | | | | Fix sim-eng build.Andy McFadden2010-07-201-2/+2
|/ / / / / / / /
* | | | | | | | MTP: Remove race condition in initial device enumeration for host mode.Mike Lockwood2010-07-202-11/+31
* | | | | | | | MTP: Fix problems reading and writing arrays in property values.Mike Lockwood2010-07-203-6/+39
* | | | | | | | MTP: add Linux host library for MTP/PTP host support.Mike Lockwood2010-07-202-0/+32
* | | | | | | | Merge "Fix Android build"Shih-wei Liao2010-07-201-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix Android buildShih-wei Liao2010-07-201-0/+4
* | | | | | | | | Merge "Change the include path."Shih-wei Liao2010-07-201-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Change the include path.Shih-wei Liao2010-07-201-3/+3
* | | | | | | | | Merge "Port ModelViewer to use the new build system. Fix the simulator build ...Shih-wei Liao2010-07-206-120/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Port ModelViewer to use the new build system.Shih-wei Liao2010-07-206-120/+10
* | | | | | | | | Switch back to use the default search of include pathYing Wang2010-07-191-3/+3
|/ / / / / / / /
* | | | | | | | Add support for linear gradients.Romain Guy2010-07-1912-22/+374
* | | | | | | | Merge "Fix build"Ying Wang2010-07-191-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix buildYing Wang2010-07-191-3/+3
* | | | | | | | | Merge "Replace try-catch code by proper type checking. Saves an exception for...Daniel Lehmann2010-07-191-19/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace try-catch code by proper type checking. Saves an exception for each b...Daniel Lehmann2010-07-191-19/+12
| |/ / / / / / / /
* | | | | | | | | Merge "Fix extraMath state variable."Jack Palevich2010-07-191-7/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix extraMath state variable.Jack Palevich2010-07-191-7/+11
* | | | | | | | | Merge ".rs files are now built by the build system."Ying Wang2010-07-196-152/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | .rs files are now built by the build system.Ying Wang2010-07-196-152/+5
* | | | | | | | | | Merge "Try to handle end-of-application better."Jack Palevich2010-07-191-16/+25
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Try to handle end-of-application better.Jack Palevich2010-07-191-16/+25
* | | | | | | | | | Merge "Write test timings to /sdcard/glperf.csv"Jack Palevich2010-07-192-3/+22
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /