summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG3CRicardo Cerqueira2015-03-103-1/+31
|\
| * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-02-020-0/+0
| |\
| | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-270-0/+0
| | |\
| | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-080-0/+0
| | | |\
| | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-11-080-0/+0
| | | | |\
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-11-060-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-11-050-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-11-040-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-11-030-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-11-020-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-11-010-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-300-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-290-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-280-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-270-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-260-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-250-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-230-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-220-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-210-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-200-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-190-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-180-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-160-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-150-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-140-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-130-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-120-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-110-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-090-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-080-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-070-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-060-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-050-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-040-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-020-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-10-010-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-09-300-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-09-290-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-09-280-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-09-270-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa...The Android Automerger2014-09-250-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 8c0bd6106978c165b249de54188b1...The Android Automerger2014-09-240-0/+0
| | | | | |\
| | | | | | * merge in lmp-mr1-release history after reset to 8c0bd6106978c165b249de54188b1...The Android Automerger2014-09-230-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to 8c0bd6106978c165b249de54188b1...The Android Automerger2014-09-230-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to 8c0bd6106978c165b249de54188b1...The Android Automerger2014-09-220-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to 8c0bd6106978c165b249de54188b1...The Android Automerger2014-09-220-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to 8c0bd6106978c165b249de54188b1...The Android Automerger2014-09-220-0/+0
| | | | | |/|
| * | | | | | Merge "Add configuration for bass" into lmp-mr1-devPrashant Malani2015-01-301-0/+16
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add configuration for bassDevin Kim2015-01-231-0/+16
| | |/ / / /