| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge tag 'android-5.1.1_r5' into cm-12.1stable/cm-12.1-YOG7Dcm-12.1 | Ricardo Cerqueira | 2015-07-04 | 5 | -5/+217 |
| |\ | | | | | | | Android 5.1.1 release 5 | ||||
| | * | Merge "resolved conflicts for merge of 11b83982 to lmp-mr1-wfc-dev" into ↵ | Xavier Ducrohet | 2015-04-23 | 0 | -0/+0 |
| | |\ | | | | | | | | | | lmp-mr1-wfc-dev | ||||
| | | * | resolved conflicts for merge of 11b83982 to lmp-mr1-wfc-dev | Xavier Ducrohet | 2015-04-23 | 4 | -2/+209 |
| | | |\ | | | | | | | | | | | | | Change-Id: Ie67cd082c41472b9fbbc0323075a38fff9c5c679 | ||||
| | * | \ | Merge commit '11b83982' into lmp-mr1-wfc-dev | Qiwen Zhao | 2015-04-23 | 4 | -2/+209 |
| | |\ \ \ | | |/ / | |/| / | | |/ | Change-Id: I4d430a54c4226541ebec4bf52cae31b75cde1e8d | ||||
| | | * | Update support repo version (22.0.1/13) and add javadoc | Xavier Ducrohet | 2015-03-31 | 4 | -2/+209 |
| | | | | | | | | | | | | | | | | | | | | | | Some projects (appcompat, gridlayout, mediarouter) didn't publish a sourcejar artifact. Change-Id: I6fd19552148051ee87b7dcc24f6272548a663b50 | ||||
| | * | | am 2fa17026: Fix android-support-v17-leanback-docs build. | Ying Wang | 2015-03-20 | 1 | -3/+3 |
| | |\| | | | | | | | | | | | | | * commit '2fa1702616d42631a6ff5defece8c4d3e709fca4': Fix android-support-v17-leanback-docs build. | ||||
| | | * | Fix android-support-v17-leanback-docs build. | Ying Wang | 2015-03-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | To include the generated R.java, you need to add android-support-v17-leanback-res's intermediate dir to LOCAL_ADDITIONAL_JAVA_DIR, not android-support-v17-leanback's. Bug: 19842418 Change-Id: I5854f1579f4417a9045da04443c70f2e95d86360 | ||||
| | * | | am e4cf5a90: workaround for aar dependencies in pom. | Xavier Ducrohet | 2015-03-07 | 1 | -0/+5 |
| | |\| | | | | | | | | | | | | | * commit 'e4cf5a90e0b6c66a075504ffe04f7eafb34c525d': workaround for aar dependencies in pom. | ||||
| | | * | workaround for aar dependencies in pom. | Xavier Ducrohet | 2015-03-06 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently depending on a non jar dependency in a pom must include the type of the dependency, even though the dependency declares its own type in its pom. Since Gradle doesn't properly do this, a workaround is to customize the pom on the fly to do this (until Gradle is fixed). Change-Id: Id39ae4b4183e621ba1295ae8ee840fd0125e5d6e | ||||
| | * | | am f48e02e3: (-s ours) Fix support lib compilation. DO NOT MERGE. | Xavier Ducrohet | 2015-03-07 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | * commit 'f48e02e352d7d86c41c3d33802a09478cccb7771': Fix support lib compilation. DO NOT MERGE. | ||||
| | | * | Fix support lib compilation. DO NOT MERGE. | Xavier Ducrohet | 2015-03-06 | 2 | -3/+2 |
| | | | | | | | | | | | | | Change-Id: I8fff3881cb4aee20c568f4678e6ee007d179054d | ||||
| | * | | am 941d64e1: (-s ours) Update version of the support lib. DO NOT MERGE. | Xavier Ducrohet | 2015-03-07 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | * commit '941d64e11385ee28b0bdc6d78e8c6361fff1b731': Update version of the support lib. DO NOT MERGE. | ||||
| | | * | Update version of the support lib. DO NOT MERGE. | Xavier Ducrohet | 2015-03-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | New artifact version: 22.0.0 to match API 22. Extra package revision incremented to 12. (cherry picked from commit 48e8e567c0f1411099499f2edcad318ab861c5fa) Change-Id: I2e46e573361d35fc89db95bd376c72dad90fe4a9 | ||||
| | * | | am 96f1e91a: (-s ours) Update Support library gradle build files. DO NOT MERGE. | Chris Banes | 2015-03-07 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | * commit '96f1e91a591cea8e671136391fa2eb71c7c6ac40': Update Support library gradle build files. DO NOT MERGE. | ||||
| | | * | Update Support library gradle build files. DO NOT MERGE. | Chris Banes | 2015-03-06 | 8 | -39/+33 |
| | |/ | | | | | | | | | | | | | | | | | | | | | Means we can now develop the support lib using Android Studio and Gradle. Need to update the Gradle prebuilts. (cherry picked from commit 6a4c14b929df9d5ca592e0ee178bfd8784fe7c0a) Change-Id: I90cebec4b492689f24a9669663630c0f02fd1035 | ||||
| * | | CMSupport: Sync MAX_ITEMS constantstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3C | Jorge Ruesga | 2015-04-14 | 1 | -1/+1 |
| | | | | | | | | | | | Change-Id: I9f39aeec0ab4461a91fc9543493ce9ccffe18cf6 Signed-off-by: Jorge Ruesga <jorge@ruesga.com> | ||||
| * | | CmSupport : Live folder empty content | Danesh M | 2015-04-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | Allow apps to specify empty layouts for folders. Change-Id: I8d0fc88c6db4202f00e65f3a94368c8a00442c8b | ||||
| * | | CmSupport : LiveFolder | Danesh Mondegarian | 2015-04-14 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | Switch to plain log errors rather than exceptions. Add api extra for existing folder ids, which is sent when folders are binded. Change-Id: I70dd8d24e9f4de3fd9479effeab75e1b821410e3 | ||||
| * | | Support : Add cm support library | Danesh M | 2015-04-14 | 2 | -0/+233 |
| | | | | | | | | | | | | | | | Cm specific public facing api's should be placed here and not pollute the framework Change-Id: I1491683a7a0420e290e0fd29c4b3fd17ee59b4a0 | ||||
| * | | Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1 | Ricardo Cerqueira | 2015-03-10 | 649 | -3988/+21099 |
| |\ \ | | | | | | | | | | Android 5.1.0 release 1 | ||||
| | * \ | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-02-02 | 0 | -0/+0 |
| | |\ \ | | |/ | |/| | |||||
| | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-28 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-27 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-26 | 0 | -0/+0 |
| | | | | |\ | |||||
| | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-19 | 0 | -0/+0 |
| | | | | | |\ | |||||
| | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-14 | 0 | -0/+0 |
| | | | | | | |\ | |||||
| | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-13 | 0 | -0/+0 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-08 | 0 | -0/+0 |
| | | | | | | | | |\ | |||||
| | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-22 | 0 | -0/+0 |
| | | | | | | | | | |\ | |||||
| | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-11 | 0 | -0/+0 |
| | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-10 | 0 | -0/+0 |
| | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-09 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-08 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-04 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-03 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-02 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-27 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-24 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-20 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-19 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-18 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-17 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-13 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-12 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-11 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-10 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-09 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-11-08 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |/|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 514fec6735a9eff2e52c85bed5a68edd8088d876 | ||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-11-06 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42e9353bb9eb2747247e30e3612b227945acfd16 | ||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-11-05 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d229684c41f79504167517c3de3236feadcbbf0 | ||||
 |
index : android_frameworks_support | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |