aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG3CRicardo Cerqueira2015-03-1018-145/+228
|\
| * 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 aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-11-080-0/+0
| | |\
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-11-060-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-11-050-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-11-040-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-11-030-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-11-020-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-11-010-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-10-300-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-10-290-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-10-280-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-10-270-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-10-260-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-10-250-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to aaf65dfe8b376ff10907a4db4d888...The Android Automerger2014-10-230-0/+0
| | |/|
| | | * merge in lmp-mr1-release history after reset to 226fe6c926409f3b64b07f0b74e92...The Android Automerger2014-10-220-0/+0
| | | |\
| | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-210-0/+0
| | | | |\
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-200-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-190-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-180-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-160-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-150-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-140-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-130-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-120-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-110-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-090-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-080-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-070-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-060-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-050-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-040-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-020-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-10-010-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-09-300-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-09-290-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-09-280-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-09-270-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-09-250-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-09-240-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-09-230-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-09-230-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-09-220-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-09-220-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 9f23a27ed9961fd4575864e590eda...The Android Automerger2014-09-220-0/+0
| | | | |/|
| * | | | | Add stable ids to SkPixelRefJohn Reck2014-11-242-2/+29
| |/ / / /
| * | | | Merge "Qualify the return value of SkImageDecoder::decode" into lmp-mr1-devLeon Scroggins III2014-10-2215-141/+194
| |\ \ \ \
| | * | | | Qualify the return value of SkImageDecoder::decodeLeon Scroggins III2014-10-2015-141/+194
| | | |/ / | | |/| |
| * | | | Merge "Fixes for decoding crashes in Play Music. DO NOT MERGE" into lmp-mr1-devLeon Scroggins2014-10-222-2/+5
| |\ \ \ \ | | |_|/ / | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 18:49:55 +0000