summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 1d2909b3: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-086-27/+0
|\
| * Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-086-27/+0
| |\
| | * Remove unused LOCAL_LDLIBS.Ying Wang2014-05-086-27/+0
| |/
* | am 8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_...Eric Laurent2014-05-062-10/+27
|\ \ | |/
| * Merge "Fix memory leak when filtering commands in insertCommand_l()"Eric Laurent2014-05-062-10/+27
| |\
| | * Fix memory leak when filtering commands in insertCommand_l()Jesper Tragardh2014-04-112-10/+27
* | | am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
|\ \ \ | |/ /
| * | Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
| |\ \
| | * | AwesomePlayer: use PTS for queueBufferLajos Molnar2014-05-011-7/+10
* | | | am b52675e9: Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
|\ \ \ \ | |/ / /
| * | | Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
| |\ \ \ | | |/ /
| | * | Smooth out AwesomePlayerLajos Molnar2014-05-012-4/+25
* | | | am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"Lajos Molnar2014-05-021-3/+7
|\ \ \ \ | |/ / /
| * | | Merge "AwesomePlayer: improve scheduling of video event to hit PTS"Lajos Molnar2014-05-021-3/+7
| |\ \ \ | | |/ /
| | * | AwesomePlayer: improve scheduling of video event to hit PTSLajos Molnar2014-05-011-3/+7
* | | | am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFit...Lajos Molnar2014-05-023-0/+288
|\ \ \ \ | |/ / /
| * | | Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"Lajos Molnar2014-05-023-0/+288
| |\ \ \ | | |/ /
| | * | stagefright: add ClockEstimator API and WindowedLinearFitEstimatorLajos Molnar2014-05-013-0/+288
* | | | am 86438382: Merge "When passing a size_t via binder, use 64-bits uncondition...Glenn Kasten2014-05-027-35/+35
|\ \ \ \ | |/ / /
| * | | Merge "When passing a size_t via binder, use 64-bits unconditionally"Glenn Kasten2014-05-027-35/+35
| |\ \ \ | | |/ / | |/| |
| | * | When passing a size_t via binder, use 64-bits unconditionallyGlenn Kasten2014-02-137-35/+35
* | | | am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
|\ \ \ \ | |/ / /
| * | | Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
| |\ \ \
| | * | | Add missing includeIgor Chernyshev2014-04-021-0/+1
* | | | | am 0c388650: Merge "ACodec: add frame render/drop systrace"Lajos Molnar2014-05-011-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge "ACodec: add frame render/drop systrace"Lajos Molnar2014-05-011-0/+7
| |\ \ \ \
| | * | | | ACodec: add frame render/drop systraceLajos Molnar2014-04-301-0/+7
* | | | | | am 6eafba6b: Merge "Temporary workaround for log spam"Glenn Kasten2014-05-011-0/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Temporary workaround for log spam"Glenn Kasten2014-05-011-0/+5
| |\ \ \ \ \
| | * | | | | Temporary workaround for log spamGlenn Kasten2014-05-011-0/+5
| | |/ / / /
* | | | | | am 761636f3: Merge "Do not force all command-line apps to be 32-bit only"Glenn Kasten2014-04-302-18/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Do not force all command-line apps to be 32-bit only"Glenn Kasten2014-04-302-18/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Do not force all command-line apps to be 32-bit onlyGlenn Kasten2014-04-302-18/+0
| |/ / / /
* | | | | am 416685d0: Merge "Fix format warnings"Glenn Kasten2014-04-301-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix format warnings"Glenn Kasten2014-04-301-3/+3
| |\ \ \ \
| | * | | | Fix format warningsGlenn Kasten2014-04-281-3/+3
* | | | | | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-2937-609/+2705
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/r...Igor Murashkin2014-03-255-44/+706
| |\ \ \ \ \
| | * | | | | DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-255-44/+706
| * | | | | | am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | resolved conflicts for merge of 3d7c5002 to klp-dev-plus-aospColin Cross2014-03-2120-70/+80
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when par...Lajos Molnar2014-03-211-0/+12
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." i...Lajos Molnar2014-03-211-0/+12
| | |\ \ \ \ \ \
| | | * | | | | | DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.Robert Shih2014-03-211-0/+12
| * | | | | | | | am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32...Rachad2014-03-211-3/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Increased recorded MP4 max file size to 4GBRachad2014-03-211-3/+5
| | |/ / / / / /
| * | | | | | | am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806:...Marco Nelissen2014-03-201-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628:...Marco Nelissen2014-03-201-0/+1
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830:...Marco Nelissen2014-03-201-0/+1
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix buildMarco Nelissen2014-03-201-0/+1
| | | | |\ \ \ \ \ \