summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.0Ricardo Cerqueira2015-03-10273-3011/+9469
|\
| * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-02-110-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-02-020-0/+0
| | | |\
| | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-290-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-220-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-150-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-070-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-230-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-220-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * Increase default allocation stack sizeMathieu Chartier2014-12-111-4/+12
| | | | | | | | | | | | | | * ART: More ELF and oat file safety measuresAndreas Gampe2014-12-112-1/+23
| | | | | | | | | | | | | | * 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-12-010-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
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix ordering of fields with the same name.Vladimir Marko2014-11-172-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix LinkFieldsComparator.Vladimir Marko2014-11-172-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix bad OOM check in Thread::CreatePeer().Vladimir Marko2014-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 90534189da43d03b45b3a214a86f8...The Android Automerger2014-11-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 1d0611c7e6721bd9115d652da74d2...The Android Automerger2014-11-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 1d0611c7e6721bd9115d652da74d2...The Android Automerger2014-11-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 471ee4410de01d2960e78d56a11ae...The Android Automerger2014-11-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-mr1-release history after reset to 22c84690dba1c02b4f9fdc3774a85...The Android Automerger2014-11-030-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 22c84690dba1c02b4f9fdc3774a85...The Android Automerger2014-11-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 7d7b143480b48a0f81a29a73b48cf...The Android Automerger2014-11-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-mr1-release history after reset to 3613c2a336fad671363656e8d16ea...The Android Automerger2014-10-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-mr1-release history after reset to f13e6d8243caaacba5f4b87a47e5b...The Android Automerger2014-10-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-mr1-release history after reset to 74dc0bee276f836f63be7558dee86...The Android Automerger2014-10-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in lmp-mr1-release history after reset to 506794738de41db046a8094e04aa2...The Android Automerger2014-10-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 506794738de41db046a8094e04aa2...The Android Automerger2014-10-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| |