aboutsummaryrefslogtreecommitdiffstats
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-1021-29/+1172
|\
| * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-02-100-0/+0
| |\
| | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-220-0/+0
| | |\
| | | * Avoid a reverse DNS-lookup for a numeric proxy addressNeil Fuller2014-12-102-1/+37
| | | * 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-200-0/+0
| | | | | |\
| | | | | | * merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger2014-11-080-0/+0
| | | | | | |\
| | | | | | | * merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger2014-11-060-0/+0
| | | | | | |/|
| | | | | | | * merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger2014-11-050-0/+0
| | | | | | |/|
| | | | | | | * merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger2014-11-040-0/+0
| | | | | | |/|
| | | | | | | * merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger2014-11-030-0/+0
| | | | | | |/|
| | | | | | | * merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger2014-11-020-0/+0
| | | | | | |/|
| | | | | | | * merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger2014-11-010-0/+0
| | | | | | |/|
| | | | | | | * merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger2014-10-300-0/+0
| | | | | | |/|
| | | | | | | * merge in lmp-mr1-release history after reset to cc168fec727bd90ca6582e21a59ec...The Android Automerger2014-10-290-0/+0
| | | | | | |/|
| | | | | | | * merge in lmp-mr1-release history after reset to 8cdfc1007818eec034fd6f547425c...The Android Automerger2014-10-280-0/+0
| | | | | | | |\
| | | | | | | | * merge in lmp-mr1-release history after reset to 602d5e4cfdbd0bad91e7872837f95...The Android Automerger2014-10-270-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger2014-10-260-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger2014-10-250-0/+0
| | | | | | | | | |/|
| | | | | | | | | | * merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger2014-10-230-0/+0
| | | | | | | | | |/|
| | | | | | | | | | * merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger2014-10-220-0/+0
| | | | | | | | | |/|
| | | | | | | | | | * merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger2014-10-210-0/+0
| | | | | | | | | |/|
| | | | | | | | | | * merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger2014-10-200-0/+0
| | | | | | | | | |/|
| | | | | | | | | | * merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger2014-10-190-0/+0
| | | | | | | | | |/|
| | | | | | | | | | * merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger2014-10-180-0/+0
| | | | | | | | | |/|
| | | | | | | | | | * merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger2014-10-160-0/+0
| | | | | | | | | |/|
| | | | | | | | | | * merge in lmp-mr1-release history after reset to 5e82edea00999f080d67b851d5949...The Android Automerger2014-10-150-0/+0
| | | | | | | | | |/|
| | | | | | | | | | * merge in lmp-mr1-release history after reset to f010a424268befb89c84a69b4dfe3...The Android Automerger2014-10-140-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in lmp-mr1-release history after reset to f010a424268befb89c84a69b4dfe3...The Android Automerger2014-10-130-0/+0
| | | | | | | | | | |/|
| | | | | | | | | | | * merge in lmp-mr1-release history after reset to 1602b29208bb574ca1847978eb3ba...The Android Automerger2014-10-120-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 1602b29208bb574ca1847978eb3ba...The Android Automerger2014-10-110-0/+0
| | | | | | | | | | | |/|
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to e256f2c51cf406843a7ed0364399f...The Android Automerger2014-10-090-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to e256f2c51cf406843a7ed0364399f...The Android Automerger2014-10-080-0/+0
| | | | | | | | | | | | |/|
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to e3bfefb13c93006a2fbe22363572a...The Android Automerger2014-10-070-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a528...The Android Automerger2014-10-060-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a528...The Android Automerger2014-10-050-0/+0
| | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a528...The Android Automerger2014-10-040-0/+0
| | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a528...The Android Automerger2014-10-020-0/+0
| | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a528...The Android Automerger2014-10-010-0/+0
| | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a528...The Android Automerger2014-09-300-0/+0
| | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a528...The Android Automerger2014-09-290-0/+0
| | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a528...The Android Automerger2014-09-280-0/+0
| | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a528...The Android Automerger2014-09-270-0/+0
| | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a528...The Android Automerger2014-09-250-0/+0
| | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a528...The Android Automerger2014-09-240-0/+0
| | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a528...The Android Automerger2014-09-230-0/+0
| | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a528...The Android Automerger2014-09-230-0/+0
| | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a528...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 8bced3e769d315a0a81b89de7a528...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | |/|