summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Ccm-12.1Ricardo Cerqueira2015-03-1011-427/+750
|\
| * 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-11-130-0/+0
| | |\
| | | * merge in lmp-mr1-release history after reset to 2f5251072284508374cb36d1e83f7...The Android Automerger2014-11-080-0/+0
| | | |\
| | | | * merge in lmp-mr1-release history after reset to 2f5251072284508374cb36d1e83f7...The Android Automerger2014-11-060-0/+0
| | | | |\ | | | |/ /
| | | | * merge in lmp-mr1-release history after reset to 2f5251072284508374cb36d1e83f7...The Android Automerger2014-11-050-0/+0
| | | | |\ | | | |/ /
| | | | * merge in lmp-mr1-release history after reset to 2f5251072284508374cb36d1e83f7...The Android Automerger2014-11-040-0/+0
| | | | |\ | | | |/ /
| | | | * merge in lmp-mr1-release history after reset to 2f5251072284508374cb36d1e83f7...The Android Automerger2014-11-030-0/+0
| | | | |\ | | | |/ /
| | | | * merge in lmp-mr1-release history after reset to 2f5251072284508374cb36d1e83f7...The Android Automerger2014-11-020-0/+0
| | | | |\ | | | |/ /
| | | | * merge in lmp-mr1-release history after reset to 2f5251072284508374cb36d1e83f7...The Android Automerger2014-11-010-0/+0
| | | | |\ | | | |/ /
| | | | * merge in lmp-mr1-release history after reset to 2f5251072284508374cb36d1e83f7...The Android Automerger2014-10-300-0/+0
| | | | |\ | | | |/ /
| | | | * merge in lmp-mr1-release history after reset to 2f5251072284508374cb36d1e83f7...The Android Automerger2014-10-290-0/+0
| | | | |\ | | | |/ /
| | | | * merge in lmp-mr1-release history after reset to 2f5251072284508374cb36d1e83f7...The Android Automerger2014-10-280-0/+0
| | | | |\ | | | |/ /
| | | | * merge in lmp-mr1-release history after reset to 2f5251072284508374cb36d1e83f7...The Android Automerger2014-10-270-0/+0
| | | | |\ | | | |/ /
| | | | * merge in lmp-mr1-release history after reset to 2f5251072284508374cb36d1e83f7...The Android Automerger2014-10-260-0/+0
| | | | |\ | | | |/ /
| | | | * merge in lmp-mr1-release history after reset to 2f5251072284508374cb36d1e83f7...The Android Automerger2014-10-250-0/+0
| | | | |\ | | | |/ /
| | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-230-0/+0
| | | | |\
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-220-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-210-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-200-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-190-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-180-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-160-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-150-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-140-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-130-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-120-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-110-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-090-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-080-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-070-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-060-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-050-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-040-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-020-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-10-010-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-09-300-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-09-290-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-09-280-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-09-270-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 70a82d9d9a59c2a0b9241fdb0b8b0...The Android Automerger2014-09-250-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-mr1-release history after reset to 2eed7ab0e5d81c0025737c6ce9931...The Android Automerger2014-09-240-0/+0
| | | | | |\
| | | | | | * merge in lmp-mr1-release history after reset to 2eed7ab0e5d81c0025737c6ce9931...The Android Automerger2014-09-230-0/+0
| | | | | | |\ | | | | | |/ /
| | | | | | * merge in lmp-mr1-release history after reset to 06b23bb5cbddfed587a6f0d756367...The Android Automerger2014-09-230-0/+0
| | | | | | |\
| | | | | | | * merge in lmp-mr1-release history after reset to 06b23bb5cbddfed587a6f0d756367...The Android Automerger2014-09-220-0/+0
| | | | | | | |\ | | | | | | |/ /
| | | | | | | * merge in lmp-mr1-release history after reset to 06b23bb5cbddfed587a6f0d756367...The Android Automerger2014-09-220-0/+0
| | | | | | | |\ | | | | | | |/ /
| | | | | | | * merge in lmp-mr1-release history after reset to 06b23bb5cbddfed587a6f0d756367...The Android Automerger2014-09-220-0/+0
| | | | | | | |\ | | | | | | |/ /
| * | | | | | | Fix StaleDataExceptionsJay Shrauner2014-12-191-2/+9
| |/ / / / / /
| * | | | | | Merge commit '25b78c8a18327bd73c3d4d34887dd63953aeaa8c' into lmp-mr1-devQiwen Zhao2014-11-121-5/+10
| |\ \ \ \ \ \
| | * | | | | | Ensure default handler always is set if no other error handler registeredAlan Newberger2014-11-041-5/+10