summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Libcpustats: Remove unused variableAndreas Gampe2014-11-251-1/+0
* Merge "Remove unused parameter"chh2014-11-251-1/+1
|\
| * Remove unused parameterBernhard Rosenkränzer2014-11-181-1/+1
* | Merge "Remove bogus forward declarations"Chih-hung Hsieh2014-11-242-4/+0
|\ \
| * | Remove bogus forward declarationsBernhard Rosenkränzer2014-11-202-4/+0
* | | Merge "Stagefright: Fix default typo"Andreas Gampe2014-11-241-2/+2
|\ \ \
| * | | Stagefright: Fix default typoAndreas Gampe2014-11-241-2/+2
|/ / /
* | | Merge "Remove check for an impossible condition"Chih-hung Hsieh2014-11-241-4/+0
|\ \ \
| * | | Remove check for an impossible conditionBernhard Rosenkraenzer2014-10-041-4/+0
* | | | Merge "C++11 compatibility."Dan Albert2014-11-209-24/+32
|\ \ \ \
| * | | | C++11 compatibility.Dan Albert2014-11-209-24/+32
| | |/ / | |/| |
* | | | Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-201-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-201-1/+1
|/ / /
* | | Merge "Use standard syntax to initialize fields."Glenn Kasten2014-11-191-712/+712
|\ \ \
| * | | Use standard syntax to initialize fields.Chih-Hung Hsieh2014-11-141-712/+712
* | | | Merge "Disable clang++ due to compiler error."Chih-Hung Hsieh2014-11-182-0/+12
|\ \ \ \
| * | | | Disable clang++ due to compiler error.Chih-Hung Hsieh2014-11-142-0/+12
| |/ / /
* | | | Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
|\ \ \ \
| * | | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-182-2/+2
| | |_|/ | |/| |
* | | | Merge "Fix uninitialized variable"Chih-hung Hsieh2014-11-181-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix uninitialized variableBernhard Rosenkränzer2014-11-181-1/+1
|/ / /
* | | Merge "No need to #include atomic-inline.h if you have atomic.h."Elliott Hughes2014-11-171-1/+0
|\ \ \
| * | | No need to #include atomic-inline.h if you have atomic.h.Elliott Hughes2014-11-171-1/+0
|/ / /
* | | Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-1713-15/+14
|\ \ \
| * | | Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-1713-15/+14
* | | | Merge "libcutils no longer requires that its users configure ANDROID_SMP."Elliott Hughes2014-11-172-9/+0
|\ \ \ \ | |/ / / |/| | |
| * | | libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-172-9/+0
|/ / /
* | | Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-1755-145/+143
|\ \ \
| * | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-1755-145/+143
|/ / /
* | | Merge "Move libldnhncr to libc++."Dan Albert2014-11-161-1/+0
|\ \ \
| * | | Move libldnhncr to libc++.Dan Albert2014-11-151-1/+0
|/ / /
* | | Merge "Include AudioPolicyInterface.h only when needed."Chih-Hung Hsieh2014-11-152-0/+3
|\ \ \ | |/ / |/| |
| * | Include AudioPolicyInterface.h only when needed.Chih-Hung Hsieh2014-11-142-0/+3
|/ /
* | Merge "libstagefright: use __predict_false from bionic rather than CONDITION ...Mark Salyzyn2014-11-121-1/+1
|\ \
| * | libstagefright: use __predict_false from bionic rather than CONDITION from lo...Mark Salyzyn2014-11-111-1/+1
|/ /
* | Merge "Move to libc++."Dan Albert2014-11-113-23/+3
|\ \
| * | Move to libc++.Dan Albert2014-11-113-23/+3
|/ /
* | Merge "Camera: Guard against asBinder() calls on NULL interfaces"Eino-Ville Talvala2014-11-107-17/+27
|\ \
| * | Camera: Guard against asBinder() calls on NULL interfacesEino-Ville Talvala2014-11-077-17/+27
* | | Merge "Remove the executable bit from source files"Glenn Kasten2014-11-1091-0/+0
|\ \ \ | |/ / |/| |
| * | Remove the executable bit from source filesMartin Storsjo2014-11-0791-0/+0
|/ /
* | Resolve conflictThe Android Open Source Project2014-11-06864-122269/+75117
|\ \
| * \ am 686a0c4d: Merge "MTP Device: Parse USB3 descriptor for MTP initor;"Mike Lockwood2014-10-291-0/+9
| |\ \
| * \ \ am d5923409: mediaplayer: limit scheduling video frames into the futureLajos Molnar2014-10-212-1/+43
| |\ \ \
| | * | | mediaplayer: limit scheduling video frames into the futureLajos Molnar2014-10-202-1/+43
| * | | | am eecb7805: NuPlayer: set anchor time for each audio buffer.Ronghua Wu2014-10-212-36/+48
| |\ \ \ \ | | |/ / /
| | * | | NuPlayer: set anchor time for each audio buffer.Ronghua Wu2014-10-202-36/+48
| * | | | am ac302143: Fix the fixMarco Nelissen2014-10-201-1/+3
| |\ \ \ \ | | |/ / /
| | * | | Fix the fixMarco Nelissen2014-10-201-1/+3
| * | | | am 22bc10a3: Merge "Clear effect buffer before sending to chain" into lmp-devMarco Nelissen2014-10-201-4/+3
| |\ \ \ \ | | |/ / /