summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1Ricardo Cerqueira2015-03-1042-62/+271
|\
| * 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 Automerger2014-11-240-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 e5515395f11ce3f6ba5ddebb1fc02...The Android Automerger2014-11-080-0/+0
| | | | |/| | | | |/|/
| | | | * merge in lmp-mr1-release history after reset to d25f8443ebf3ec5adb28ae6e24c3d...The Android Automerger2014-11-060-0/+0
| | | | |\
| | | | | * merge in lmp-mr1-release history after reset to d25f8443ebf3ec5adb28ae6e24c3d...The Android Automerger2014-11-050-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to d25f8443ebf3ec5adb28ae6e24c3d...The Android Automerger2014-11-040-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to d25f8443ebf3ec5adb28ae6e24c3d...The Android Automerger2014-11-030-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to d25f8443ebf3ec5adb28ae6e24c3d...The Android Automerger2014-11-020-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to d25f8443ebf3ec5adb28ae6e24c3d...The Android Automerger2014-11-010-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to d25f8443ebf3ec5adb28ae6e24c3d...The Android Automerger2014-10-300-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to d25f8443ebf3ec5adb28ae6e24c3d...The Android Automerger2014-10-290-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to d25f8443ebf3ec5adb28ae6e24c3d...The Android Automerger2014-10-280-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to d25f8443ebf3ec5adb28ae6e24c3d...The Android Automerger2014-10-270-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to d25f8443ebf3ec5adb28ae6e24c3d...The Android Automerger2014-10-260-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to d25f8443ebf3ec5adb28ae6e24c3d...The Android Automerger2014-10-250-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to d25f8443ebf3ec5adb28ae6e24c3d...The Android Automerger2014-10-230-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to d25f8443ebf3ec5adb28ae6e24c3d...The Android Automerger2014-10-220-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to d25f8443ebf3ec5adb28ae6e24c3d...The Android Automerger2014-10-210-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to d25f8443ebf3ec5adb28ae6e24c3d...The Android Automerger2014-10-200-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to d9c04a6b65f1eba95b87a00b90f86...The Android Automerger2014-10-190-0/+0
| | | | | |\
| | | | | | * merge in lmp-mr1-release history after reset to d9c04a6b65f1eba95b87a00b90f86...The Android Automerger2014-10-180-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to d9c04a6b65f1eba95b87a00b90f86...The Android Automerger2014-10-160-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to d9c04a6b65f1eba95b87a00b90f86...The Android Automerger2014-10-150-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to 946d7388c7afa8043379eb30176fb...The Android Automerger2014-10-140-0/+0
| | | | | | |\
| | | | | | | * merge in lmp-mr1-release history after reset to 946d7388c7afa8043379eb30176fb...The Android Automerger2014-10-130-0/+0
| | | | | | |/|
| | | | | | | * merge in lmp-mr1-release history after reset to 946d7388c7afa8043379eb30176fb...The Android Automerger2014-10-120-0/+0
| | | | | | |/|
| | | | | | | * merge in lmp-mr1-release history after reset to 946d7388c7afa8043379eb30176fb...The Android Automerger2014-10-110-0/+0
| | | | | | |/|
| | | | | | | * merge in lmp-mr1-release history after reset to 946d7388c7afa8043379eb30176fb...The Android Automerger2014-10-090-0/+0
| | | | | | |/|
| | | | | | | * merge in lmp-mr1-release history after reset to 946d7388c7afa8043379eb30176fb...The Android Automerger2014-10-080-0/+0
| | | | | | |/|
| | | | | | | * merge in lmp-mr1-release history after reset to 5c451d58935b68d64574764f6253a...The Android Automerger2014-10-070-0/+0
| | | | | | | |\
| | | | | | | | * merge in lmp-mr1-release history after reset to 5c451d58935b68d64574764f6253a...The Android Automerger2014-10-060-0/+0
| | | | | | | |/|
| | | | | | | | * merge in lmp-mr1-release history after reset to 1bf3bb5de371b3f9d9e3709f5df32...The Android Automerger2014-10-050-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in lmp-mr1-release history after reset to 1bf3bb5de371b3f9d9e3709f5df32...The Android Automerger2014-10-040-0/+0
| | | | | | | | |/|
| | | | | | | | | * merge in lmp-mr1-release history after reset to 318388767d7f6d651f05f4ab90222...The Android Automerger2014-10-020-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in lmp-mr1-release history after reset to ca87a6c90aa3efe3d4429bcd772be...The Android Automerger2014-10-010-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in lmp-mr1-release history after reset to ca87a6c90aa3efe3d4429bcd772be...The Android Automerger2014-09-300-0/+0
| | | | | | | | | | |/|
| | | | | | | | | | | * merge in lmp-mr1-release history after reset to a76e11a24aac700638ec3a7fc5ed7...The Android Automerger2014-09-290-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to a76e11a24aac700638ec3a7fc5ed7...The Android Automerger2014-09-280-0/+0
| | | | | | | | | | | |/|
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to a76e11a24aac700638ec3a7fc5ed7...The Android Automerger2014-09-270-0/+0
| | | | | | | | | | | |/|
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to a76e11a24aac700638ec3a7fc5ed7...The Android Automerger2014-09-250-0/+0
| | | | | | | | | | | |/|
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to a76e11a24aac700638ec3a7fc5ed7...The Android Automerger2014-09-240-0/+0
| | | | | | | | | | | |/|
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to a76e11a24aac700638ec3a7fc5ed7...The Android Automerger2014-09-230-0/+0
| | | | | | | | | | | |/|
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to a76e11a24aac700638ec3a7fc5ed7...The Android Automerger2014-09-230-0/+0
| | | | | | | | | | | |/|
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 0d3bcde702f58aa4c1c0379937d8b...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 0d3bcde702f58aa4c1c0379937d8b...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | |/|
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to 0d3bcde702f58aa4c1c0379937d8b...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | |/|
| * | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2015-01-2914-612/+312
| |\ \ \ \ \ \ \ \ \ \ \ \ \