summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in nyc-release history after reset to nyc-devstaging/cm-14.0The Android Automerger2016-05-150-0/+0
|\
| * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-020-0/+0
| |\
| | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-020-0/+0
| | |\ | | |/ | |/|
| * | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-010-0/+0
| |\|
| | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-270-0/+0
| | |\
| | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-220-0/+0
| | | |\
| | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-200-0/+0
| | | | |\
| | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-150-0/+0
| | | | | |\
| | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-130-0/+0
| | | | | | |\
| | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-100-0/+0
| | | | | | | |\
| | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-020-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-230-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-190-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-170-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-140-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * unblock infinite loop when enumerating video codecsLajos Molnar2016-02-111-1/+1
| | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-110-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-100-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-090-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * Missing parentheses around #define.ilewis2016-02-031-2/+2
| | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | * | merge in nyc-release history after reset to masterThe Android Automerger2016-02-010-0/+0
| | | | | | | | | | | | | | | | |\|
| | | | | | | | | | | | | | | | | * Revert "Get codec from codec process"Marco Nelissen2016-01-281-7/+2
* | | | | | | | | | | | | | | | | | Don't specify sub-buffer count for non-fast tracksGlenn Kasten2016-05-131-4/+6
|/ / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / Allow OpenSL ES to specify a total buffer size for a fast trackGlenn Kasten2016-04-281-1/+5
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "Fix 32-bit/64-bit problem in AquireJavaRoutingProxy() JNI." into nyc-devPaul Mclean2016-03-251-22/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix 32-bit/64-bit problem in AquireJavaRoutingProxy() JNI.Paul McLean2016-03-251-22/+26
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "Make build warnings be errors" into nyc-devGlenn Kasten2016-03-248-0/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Make build warnings be errorsGlenn Kasten2016-03-248-0/+55
| |/ / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / Fix build warningsGlenn Kasten2016-03-2413-37/+2
|/ / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / Fix copy/paste errorGlenn Kasten2016-03-211-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "Use audio_session_t consistently" into nyc-devGlenn Kasten2016-03-177-16/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Use audio_session_t consistentlyGlenn Kasten2016-03-107-16/+21
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Native routing phase 4Paul McLean2016-03-143-13/+55
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Native Routing API - Phase 3Paul McLean2016-03-092-2/+15
|/ / / / / / / / / / /
* / / / / / / / / / / "Refinements" to Native Audio Routing APIPaul McLean2016-03-094-81/+258
|/ / / / / / / / / /
* | | | | | | | | | Merge "Single definition of USE_DEBUG in Configuration.h" into nyc-devGlenn Kasten2016-03-017-3/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Single definition of USE_DEBUG in Configuration.hGlenn Kasten2016-03-017-3/+34
| |/ / / / / / / / /
* | | | | | | | | | Merge "Native Routing Implementation" into nyc-devPaul Mclean2016-03-012-2/+119
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Native Routing ImplementationPaul McLean2016-03-012-2/+119
| |/ / / / / / / / /
* / / / / / / / / / Add use for audio_unique_id_tGlenn Kasten2016-02-292-2/+2
|/ / / / / / / / /
* / / / / / / / / Enable -Werror and fix warnings in frameworks/wilhelm.Aurimas Liutikas2016-02-2216-56/+35
|/ / / / / / / /
* | | | | | | | Merge "Fix the last warnings in frameworks/wilhelm." into nyc-devAurimas Liutikas2016-02-194-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix the last warnings in frameworks/wilhelm.Aurimas Liutikas2016-02-184-6/+6
| |/ / / / / / /
* / / / / / / / Suppress -Winitializer-overrides warnings in frameworks/wilhelm.Aurimas Liutikas2016-02-181-1/+1
|/ / / / / / /
* / / / / / / Emulating old channel mask behavior for both input and outputilewis2016-02-162-7/+20
|/ / / / / /
* | | | | | remove OMXCodec.h dependencyLajos Molnar2016-02-123-2/+2
* | | | | | unblock infinite loop when enumerating video codecsLajos Molnar2016-02-111-1/+1
|/ / / / /
* | | | | Merge "Document default behavior when channel mask is 0" into nyc-devIan Ni-Lewis2016-02-101-0/+6
|\ \ \ \ \