summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-5.1.1_r5' into cm-12.1stable/cm-12.1-YOG7Dcm-12.1Ricardo Cerqueira2015-07-045-5/+217
|\
| * Merge "resolved conflicts for merge of 11b83982 to lmp-mr1-wfc-dev" into lmp-...Xavier Ducrohet2015-04-230-0/+0
| |\
| | * resolved conflicts for merge of 11b83982 to lmp-mr1-wfc-devXavier Ducrohet2015-04-234-2/+209
| | |\
| * | \ Merge commit '11b83982' into lmp-mr1-wfc-devQiwen Zhao2015-04-234-2/+209
| |\ \ \ | | |/ / | |/| / | | |/
| | * Update support repo version (22.0.1/13) and add javadocXavier Ducrohet2015-03-314-2/+209
| * | am 2fa17026: Fix android-support-v17-leanback-docs build.Ying Wang2015-03-201-3/+3
| |\|
| | * Fix android-support-v17-leanback-docs build.Ying Wang2015-03-191-3/+3
| * | am e4cf5a90: workaround for aar dependencies in pom.Xavier Ducrohet2015-03-071-0/+5
| |\|
| | * workaround for aar dependencies in pom.Xavier Ducrohet2015-03-061-0/+5
| * | am f48e02e3: (-s ours) Fix support lib compilation. DO NOT MERGE.Xavier Ducrohet2015-03-070-0/+0
| |\|
| | * Fix support lib compilation. DO NOT MERGE.Xavier Ducrohet2015-03-062-3/+2
| * | am 941d64e1: (-s ours) Update version of the support lib. DO NOT MERGE.Xavier Ducrohet2015-03-070-0/+0
| |\|
| | * Update version of the support lib. DO NOT MERGE.Xavier Ducrohet2015-03-061-2/+2
| * | am 96f1e91a: (-s ours) Update Support library gradle build files. DO NOT MERGE.Chris Banes2015-03-070-0/+0
| |\|
| | * Update Support library gradle build files. DO NOT MERGE.Chris Banes2015-03-068-39/+33
| |/
* | CMSupport: Sync MAX_ITEMS constantstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3CJorge Ruesga2015-04-141-1/+1
* | CmSupport : Live folder empty contentDanesh M2015-04-141-2/+2
* | CmSupport : LiveFolderDanesh Mondegarian2015-04-141-2/+8
* | Support : Add cm support libraryDanesh M2015-04-142-0/+233
* | Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1Ricardo Cerqueira2015-03-10649-3988/+21099
|\ \
| * \ 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-280-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 Automerger2015-01-260-0/+0
| | | | |\
| | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-190-0/+0
| | | | | |\
| | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-140-0/+0
| | | | | | |\
| | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-130-0/+0
| | | | | | | |\
| | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-080-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-220-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-110-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-100-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-090-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 lmp-mr1-devThe Android Automerger2014-12-040-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-030-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-020-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-270-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-240-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-200-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-190-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-180-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 514fec6735a9eff2e52c85bed5a68...The Android Automerger2014-11-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |/|/
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 42e9353bb9eb2747247e30e3612b2...The Android Automerger2014-11-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 3d229684c41f79504167517c3de32...The Android Automerger2014-11-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\