Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 26d92768: am 34c55e3e: Merge "No need to #include atomic-inline.h if you h... | Elliott Hughes | 2014-11-17 | 1 | -1/+0 |
|\ | |||||
| * | am 34c55e3e: Merge "No need to #include atomic-inline.h if you have atomic.h." | Elliott Hughes | 2014-11-17 | 1 | -1/+0 |
| |\ | |||||
| | * | Merge "No need to #include atomic-inline.h if you have atomic.h." | Elliott Hughes | 2014-11-17 | 1 | -1/+0 |
| | |\ | |||||
| | | * | No need to #include atomic-inline.h if you have atomic.h. | Elliott Hughes | 2014-11-17 | 1 | -1/+0 |
| | |/ | |||||
* | | | am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches" | Chih-hung Hsieh | 2014-11-17 | 13 | -15/+14 |
|\ \ \ | |/ / | |||||
| * | | am c80b9b83: Merge "Fix struct vs. class mismatches" | Chih-hung Hsieh | 2014-11-17 | 13 | -15/+14 |
| |\ \ | | |/ | |||||
| | * | Merge "Fix struct vs. class mismatches" | Chih-hung Hsieh | 2014-11-17 | 13 | -15/+14 |
| | |\ | |||||
| | | * | Fix struct vs. class mismatches | Bernhard Rosenkränzer | 2014-11-17 | 13 | -15/+14 |
* | | | | am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-aosp-master | Elliott Hughes | 2014-11-17 | 2 | -19/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | resolved conflicts for merge of 3bc345f5 to stage-aosp-master | Elliott Hughes | 2014-11-17 | 2 | -19/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge "libcutils no longer requires that its users configure ANDROID_SMP." | Elliott Hughes | 2014-11-17 | 2 | -9/+0 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | libcutils no longer requires that its users configure ANDROID_SMP. | Elliott Hughes | 2014-11-17 | 2 | -9/+0 |
| | |/ | |||||
* | | | am 771a362d: am 3171f4e1: Merge "CameraService: normalize face rectangles pro... | Chien-Yu Chen | 2014-11-17 | 3 | -73/+90 |
|\ \ \ | |||||
| * \ \ | am 3171f4e1: Merge "CameraService: normalize face rectangles properly" into l... | Chien-Yu Chen | 2014-11-17 | 3 | -73/+90 |
| |\ \ \ | |||||
| | * \ \ | Merge "CameraService: normalize face rectangles properly" into lmp-mr1-dev | Chien-Yu Chen | 2014-11-17 | 3 | -73/+90 |
| | |\ \ \ | |||||
| | | * | | | CameraService: normalize face rectangles properly | Chien-Yu Chen | 2014-11-13 | 3 | -73/+90 |
* | | | | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aosp | Marco Nelissen | 2014-11-17 | 55 | -145/+143 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | am 9b77083e: Merge "Update calls to IInterface::asBinder()" | Marco Nelissen | 2014-11-17 | 55 | -145/+143 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge "Update calls to IInterface::asBinder()" | Marco Nelissen | 2014-11-17 | 55 | -145/+143 |
| | |\ \ \ \ | |||||
| | | * | | | | Update calls to IInterface::asBinder() | Marco Nelissen | 2014-11-17 | 55 | -145/+143 |
| | |/ / / / | |||||
* | | | | | | am bb0cf4d0: am d0264109: Merge "Move libldnhncr to libc++." | Dan Albert | 2014-11-16 | 1 | -1/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am d0264109: Merge "Move libldnhncr to libc++." | Dan Albert | 2014-11-16 | 1 | -1/+0 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "Move libldnhncr to libc++." | Dan Albert | 2014-11-16 | 1 | -1/+0 |
| | |\ \ \ \ | |||||
| | | * | | | | Move libldnhncr to libc++. | Dan Albert | 2014-11-15 | 1 | -1/+0 |
| | |/ / / / | |||||
* | | | | | | am addfc718: Merge "NuPlayer: tunnel decoder with renderer for data buffer pa... | Wei Jia | 2014-11-15 | 7 | -124/+205 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | am addfc718: Merge "NuPlayer: tunnel decoder with renderer for data buffer pa... | Wei Jia | 2014-11-15 | 7 | -124/+205 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge "NuPlayer: tunnel decoder with renderer for data buffer passing." into ... | Wei Jia | 2014-11-15 | 7 | -124/+205 |
| | |\ \ \ \ | |||||
| | | * | | | | NuPlayer: tunnel decoder with renderer for data buffer passing. | Wei Jia | 2014-11-14 | 7 | -124/+205 |
* | | | | | | | am f97dfbc9: Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr... | Robert Shih | 2014-11-15 | 1 | -27/+37 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am f97dfbc9: Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr... | Robert Shih | 2014-11-15 | 1 | -27/+37 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr1-dev | Robert Shih | 2014-11-15 | 1 | -27/+37 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | PlaylistFetcher: handle sporadic fetch erros | Robert Shih | 2014-11-13 | 1 | -27/+37 |
* | | | | | | | | am 0ef3210f: am 14a74010: Merge "Include AudioPolicyInterface.h only when nee... | Chih-Hung Hsieh | 2014-11-15 | 2 | -0/+3 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | am 14a74010: Merge "Include AudioPolicyInterface.h only when needed." | Chih-Hung Hsieh | 2014-11-15 | 2 | -0/+3 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | Merge "Include AudioPolicyInterface.h only when needed." | Chih-Hung Hsieh | 2014-11-15 | 2 | -0/+3 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Include AudioPolicyInterface.h only when needed. | Chih-Hung Hsieh | 2014-11-14 | 2 | -0/+3 |
| | |/ / / / / / | |||||
* | | | | | | | | am 339b5f77: am a82b5f57: Merge "libstagefright: use __predict_false from bio... | Mark Salyzyn | 2014-11-15 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am a82b5f57: Merge "libstagefright: use __predict_false from bionic rather th... | Mark Salyzyn | 2014-11-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge "libstagefright: use __predict_false from bionic rather than CONDITION ... | Mark Salyzyn | 2014-11-12 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | libstagefright: use __predict_false from bionic rather than CONDITION from lo... | Mark Salyzyn | 2014-11-11 | 1 | -1/+1 |
| | |/ / / / / / | |||||
* | | | | | | | | am 990dad99: Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into ... | Eric Laurent | 2014-11-14 | 3 | -30/+15 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | am 990dad99: Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into ... | Eric Laurent | 2014-11-14 | 3 | -30/+15 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into lmp-mr1-dev | Eric Laurent | 2014-11-14 | 3 | -30/+15 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | remove AudioSystem::getOutputSamplingRateForAttr() | Eric Laurent | 2014-11-12 | 3 | -30/+15 |
* | | | | | | | | | am 41907c44: am cede28e2: Merge "stagefright: add runtime debug support" into... | Lajos Molnar | 2014-11-14 | 11 | -440/+830 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am cede28e2: Merge "stagefright: add runtime debug support" into lmp-mr1-dev | Lajos Molnar | 2014-11-14 | 11 | -440/+830 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge "stagefright: add runtime debug support" into lmp-mr1-dev | Lajos Molnar | 2014-11-14 | 11 | -440/+830 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | stagefright: add runtime debug support | Lajos Molnar | 2014-11-12 | 11 | -440/+830 |
* | | | | | | | | | | am 08961d0b: am 97e6ca1a: Merge "Stagefright: use MediaCodec in async mode fo... | Chong Zhang | 2014-11-14 | 2 | -168/+105 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 97e6ca1a: Merge "Stagefright: use MediaCodec in async mode for recording" ... | Chong Zhang | 2014-11-13 | 2 | -168/+105 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / |