summaryrefslogtreecommitdiffstats
Commit message (Collapse)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-1077-561/+1927
|\ | | | | | | | | | | | | | | | | Android 5.1.0 release 1 Conflicts: chromium/java/com/android/webview/chromium/WebViewChromium.java Change-Id: I0d86d5b1da5a8de7d9b369dc2bac75972c7fe300
| * 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-170-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 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 ↵The Android Automerger2014-11-080-0/+0
| | | | | |/| | | | | |/|/ | | | | | | | | | | | | edcfb0f0e74b0cbbd025397ecec6a80cb866854d
| | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-060-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | 8a26cc6f7dd4d893790e7c4f13df901845ab045d
| | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-050-0/+0
| | | | | |/| | | | | | | | | | | | | | | | | | | | | | 8a26cc6f7dd4d893790e7c4f13df901845ab045d
| | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-040-0/+0
| | | | | |/| | | | | | | | | | | | | | | | | | | | | | 8a26cc6f7dd4d893790e7c4f13df901845ab045d
| | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-030-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | bf95f761ba3d2dee0ee98b7204d289f35c4f478d
| | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-020-0/+0
| | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | bf95f761ba3d2dee0ee98b7204d289f35c4f478d
| | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-010-0/+0
| | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | bf95f761ba3d2dee0ee98b7204d289f35c4f478d
| | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-300-0/+0
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 620317df09cbb4425b366ad48f7a86e9016a53d4
| | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-290-0/+0
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a2779d553a06af1dc903c98071ef4db300b177d
| | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-280-0/+0
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 248d0477b27ef31220ecd9a736bab75fd8f5e9b2
| | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-270-0/+0
| | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 248d0477b27ef31220ecd9a736bab75fd8f5e9b2
| | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-260-0/+0
| | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 248d0477b27ef31220ecd9a736bab75fd8f5e9b2
| | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-250-0/+0
| | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 248d0477b27ef31220ecd9a736bab75fd8f5e9b2
| | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-230-0/+0
| | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8735fb890a3a7b16f4014a4da7736939f5e34891
| | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-220-0/+0
| | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8735fb890a3a7b16f4014a4da7736939f5e34891
| | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-210-0/+0
| | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8735fb890a3a7b16f4014a4da7736939f5e34891
| | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-200-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b0adb327ef78ed74ea3f87c085a974c65cdbf00a
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-190-0/+0
| | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b0adb327ef78ed74ea3f87c085a974c65cdbf00a
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-180-0/+0
| | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b0adb327ef78ed74ea3f87c085a974c65cdbf00a
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-160-0/+0
| | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b0adb327ef78ed74ea3f87c085a974c65cdbf00a
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-150-0/+0
| | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b0adb327ef78ed74ea3f87c085a974c65cdbf00a
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-140-0/+0
| | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b0adb327ef78ed74ea3f87c085a974c65cdbf00a
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-130-0/+0
| | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b0adb327ef78ed74ea3f87c085a974c65cdbf00a
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-120-0/+0
| | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6084b0bc9180898565b917c5694a79defd0060fb
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-110-0/+0
| | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6084b0bc9180898565b917c5694a79defd0060fb
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-090-0/+0
| | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6084b0bc9180898565b917c5694a79defd0060fb
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-080-0/+0
| | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6084b0bc9180898565b917c5694a79defd0060fb
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-070-0/+0
| | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6084b0bc9180898565b917c5694a79defd0060fb
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-060-0/+0
| | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca3ebe61951d92501599e3120c0fd30b0d7264de
| | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-050-0/+0
| | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca3ebe61951d92501599e3120c0fd30b0d7264de
| | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-040-0/+0
| | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca3ebe61951d92501599e3120c0fd30b0d7264de
| | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-020-0/+0
| | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 040a02dbeefe9138549dde8c61a4a4ae424fbce5
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-010-0/+0
| | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8192f7167f561cd7a4c5c629ffdd1260a6749a55
| | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-300-0/+0
| | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8192f7167f561cd7a4c5c629ffdd1260a6749a55
| | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-290-0/+0
| | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8192f7167f561cd7a4c5c629ffdd1260a6749a55
| | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-280-0/+0
| | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8192f7167f561cd7a4c5c629ffdd1260a6749a55
| | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-270-0/+0
| | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8192f7167f561cd7a4c5c629ffdd1260a6749a55
| | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-250-0/+0
| | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80bf8d5e3d799c7680d45ef214c8b91097794ccf
| | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-240-0/+0
| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80bf8d5e3d799c7680d45ef214c8b91097794ccf
| | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-230-0/+0
| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80bf8d5e3d799c7680d45ef214c8b91097794ccf
| | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-230-0/+0
| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80bf8d5e3d799c7680d45ef214c8b91097794ccf
| | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80bf8d5e3d799c7680d45ef214c8b91097794ccf
| | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80bf8d5e3d799c7680d45ef214c8b91097794ccf
| | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80bf8d5e3d799c7680d45ef214c8b91097794ccf
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 08:53:08 +0000