summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* classpath: updated Calculator and ContactsCommon lib versionsstable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3CErica Chang2015-04-011-2/+2
* Merge tag 'android-5.1.0_r3' of https://android.googlesource.com/platform/dev...staging/cm-12.1Steve Kondik2015-03-271-1/+2
|\
| * Fix the buildJim Miller2015-02-251-1/+2
* | Merge tag 'android-5.1.0_r1' into HEADRicardo Cerqueira2015-03-101817-14610/+35204
|\|
| * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-02-160-0/+0
| |\
| | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-02-090-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-060-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-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-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-110-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to eb7edd585abb0bc6c039882cdec8d...The Android Automerger2014-11-080-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to eb7edd585abb0bc6c039882cdec8d...The Android Automerger2014-11-060-0/+0
| | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to d00a0a734ef64ba917e5a124a16c1...The Android Automerger2014-11-050-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to d00a0a734ef64ba917e5a124a16c1...The Android Automerger2014-11-040-0/+0
| | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 66b2f251c72c82098a2a84a2b8764...The Android Automerger2014-11-030-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 66b2f251c72c82098a2a84a2b8764...The Android Automerger2014-11-020-0/+0
| | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 2f6ded27f69c67b64b65e754beb56...The Android Automerger2014-11-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 2f6ded27f69c67b64b65e754beb56...The Android Automerger2014-10-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 455a4c3f915bce079ca2aceb4fc30...The Android Automerger2014-10-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to d18c4a82e0a9837301436411867ca...The Android Automerger2014-10-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ca4362bc81e8bef2820536a2b552d...The Android Automerger2014-10-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ca4362bc81e8bef2820536a2b552d...The Android Automerger2014-10-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ca4362bc81e8bef2820536a2b552d...The Android Automerger2014-10-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 3cbcd20f330527eaf9af679d5db85...The Android Automerger2014-10-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to c29dc0d2609830eb7ea59741c1d63...The Android Automerger2014-10-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to c29dc0d2609830eb7ea59741c1d63...The Android Automerger2014-10-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 804aad7383e8ee592048e1bb227ef...The Android Automerger2014-10-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 297089b18ed58c1b297767256b9d2...The Android Automerger2014-10-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 297089b18ed58c1b297767256b9d2...The Android Automerger2014-10-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 97f11e1c34eef659c69138d393467...The Android Automerger2014-10-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 913f814641732ac243f823431d3df...The Android Automerger2014-10-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 913f814641732ac243f823431d3df...The Android Automerger2014-10-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 913f814641732ac243f823431d3df...The Android Automerger2014-10-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 913f814641732ac243f823431d3df...The Android Automerger2014-10-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 913f814641732ac243f823431d3df...The Android Automerger2014-10-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 9ac2afe4cef95ed49903ac64b3d57...The Android Automerger2014-10-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 9ac2afe4cef95ed49903ac64b3d57...The Android Automerger2014-10-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 3f75a9a0341599c228592895fe495...The Android Automerger2014-10-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\