summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/har...cm-10.1-M2mr1.1-stagingSteve Kondik2013-02-121-13/+45
|\
| * Fix HWC documentation.Mathias Agopian2012-11-201-13/+45
| *-. Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |\ \
| | * \ merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | |\ \
| | | * \ merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | |\ \
* | | | \ \ Merge "FM Radio: Add support for FM Radio in Android" into cm-10.1Jef Oliver2013-01-301-0/+172
|\ \ \ \ \ \
| * | | | | | FM Radio: Add support for FM Radio in AndroidJohan Palmaeus2013-01-211-0/+172
* | | | | | | hwcomposer: Add HWC_BLIT compositiontype valueArun Kumar K.R2013-01-231-0/+3
* | | | | | | Add gralloc_perform enums definitionsRamkumar Radhakrishnan2013-01-231-0/+5
|/ / / / / /
* | | | | | Revert "Change-Id: Ie2dcf87494c71d6da9493eddad8fe0a59ac5f0f9"cm-10.1-M1Steve Kondik2012-12-221-4/+0
* | | | | | audio: add support for VOIPMingming Yin2012-12-201-13/+6
* | | | | | Change-Id: Ie2dcf87494c71d6da9493eddad8fe0a59ac5f0f9Shareef Ali2012-11-281-0/+4
* | | | | | exynos4: gralloc: add camera and nonecache usagecodeworkx2012-11-241-0/+3
* | | | | | Extend ICS_AUDIO_BLOB back-compat to the 4.2 APIRicardo Cerqueira2012-11-231-0/+6
* | | | | | Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/ha...Steve Kondik2012-11-1838-427/+5399
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-310-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | |\ \ \ | | | | |/ / | | | |/| / | | | | |/
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-090-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-090-0/+0
| | | | |/| | | | |/|/
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-020-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-300-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-300-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-220-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-210-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-190-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-180-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-160-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-140-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-140-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-130-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-110-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-090-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-050-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-030-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-280-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-270-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-230-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Revert "Add multi-display and flip fence to HWC"Jesse Hall2012-07-312-69/+64
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shutdown audio pipe when closing input streamJean-Michel Trivi2012-10-301-2/+16
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / / / / / / / / / / / / / / Support querying active record sourcesJean-Michel Trivi2012-10-101-0/+3
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / / / / / / / / / / / / / hwcomposer: Specify set() call error behavior.Jamie Gennis2012-10-081-3/+10
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "NFC HAL: Use a separate callback for data." into jb-mr1-devMartijn Coenen2012-10-012-23/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |