summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG4Pstable/cm-12.1-YOG3CRicardo Cerqueira2015-03-1079-9/+217
|\
| * am 86799f35: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-01-140-0/+0
| |\
| | * Import translations. DO NOT MERGEGeoff Mendal2015-01-1424-48/+24
| * | Import translations. DO NOT MERGEGeoff Mendal2015-01-1472-1/+73
| * | am 7f8c883e: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-01-120-0/+0
| |\|
| | * Import translations. DO NOT MERGEGeoff Mendal2015-01-1272-1/+505
| * | am 9ea7077c: Bug 18864683: AccessibilityShri Borde2015-01-123-2/+109
| |\|
| | * Bug 18864683: AccessibilityShri Borde2015-01-073-2/+109
| * | am 307bd804: Hide "couldn\'t load image" on image load.Andrew Sapperstein2014-11-141-0/+1
| |\|
| | * Hide "couldn't load image" on image load.Andrew Sapperstein2014-11-141-0/+1
| * | am 66bd836c: am d7a72217: am 05f451df: Bug 16879455: setScaleAnimation() resu...Shri Borde2014-10-293-6/+24
| |\ \
| | * \ am d7a72217: am 05f451df: Bug 16879455: setScaleAnimation() results in Runtim...Shri Borde2014-10-283-6/+24
| | |\ \
| | | * | am 05f451df: Bug 16879455: setScaleAnimation() results in RuntimeExceptionShri Borde2014-10-283-6/+24
| | | |\|
| | | | * Bug 16879455: setScaleAnimation() results in RuntimeExceptionShri Borde2014-10-283-6/+24
| * | | | am c81f9696: am cddd71fb: am ff6ac38c: Bug 17474391: Opening a different phot...Shri Borde2014-10-231-1/+11
| |\| | |
| | * | | am cddd71fb: am ff6ac38c: Bug 17474391: Opening a different photo from same l...Shri Borde2014-10-221-1/+11
| | |\| |
| | | * | am ff6ac38c: Bug 17474391: Opening a different photo from same list of photosShri Borde2014-10-221-1/+11
| | | |\|
| | | | * Bug 17474391: Opening a different photo from same list of photosShri Borde2014-10-221-1/+11
| * | | | am 3ccce4c2: (-s ours) am 82839eca: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| |\| | |
| | * | | am 82839eca: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| |/| | | | | |/ /
* | | | merge in lmp-release history after reset to 82839eca7d14c95fe7f147fe04ddfe80c...staging/cm-12.0-cafstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-12.0The Android Automerger2014-10-210-0/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | merge in lmp-release history after reset to 82839eca7d14c95fe7f147fe04ddfe80c...The Android Automerger2014-10-210-0/+0
|/| | |
| * | | merge in lmp-release history after reset to 82839eca7d14c95fe7f147fe04ddfe80c...The Android Automerger2014-10-190-0/+0
|/| | |
| * | | merge in lmp-release history after reset to ae0d65c978ca87cc7b1051d3eceda4681...The Android Automerger2014-10-160-0/+0
| |\ \ \
| | * | | merge in lmp-release history after reset to ae0d65c978ca87cc7b1051d3eceda4681...The Android Automerger2014-10-150-0/+0
| |/| | |
| | * | | merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90...The Android Automerger2014-10-140-0/+0
| | |\ \ \
| | | * | | merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90...The Android Automerger2014-10-130-0/+0
| | |/| | |
| | | * | | merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90...The Android Automerger2014-10-120-0/+0
| | |/| | |
| | | * | | merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90...The Android Automerger2014-10-090-0/+0
| | |/| | |
| | | * | | merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90...The Android Automerger2014-10-080-0/+0
| | |/| | |
| | | * | | merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90...The Android Automerger2014-10-070-0/+0
| | |/| | |
| | | * | | merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90...The Android Automerger2014-10-060-0/+0
| | |/| | |
| | | * | | merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90...The Android Automerger2014-10-050-0/+0
| | |/| | |
| | | * | | merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90...The Android Automerger2014-10-010-0/+0
| | |/| | |
| | | * | | merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90...The Android Automerger2014-09-300-0/+0
| | |/| | |
| | | * | | merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90...The Android Automerger2014-09-290-0/+0
| | |/| | |
| | | * | | merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90...The Android Automerger2014-09-280-0/+0
| | |/| | |
| | | * | | merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90...The Android Automerger2014-09-250-0/+0
| | |/| | |
| | | * | | merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90...The Android Automerger2014-09-240-0/+0
| | |/| | |
| | | * | | merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90...The Android Automerger2014-09-230-0/+0
| | |/| | |
| | | * | | merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90...The Android Automerger2014-09-220-0/+0
| | |/| | |
| | | * | | merge in lmp-release history after reset to 998fbbfb259b7f0e37ea4c4cb2429ce90...The Android Automerger2014-09-210-0/+0
| | |/| | |
| | | * | | merge in lmp-release history after reset to de835908728b71ad800cdd54b7280d58f...The Android Automerger2014-09-200-0/+0
| | | |\ \ \ | | | |/ / / | | |/| | |
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-191-1/+1
| |_|_|/ / |/| | | |
* | | | | am 0667dbcd: Overzoom animation added when attempting to zoom past max scale.khoaha2014-10-171-5/+38
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Overzoom animation added when attempting to zoom past max scale.khoaha2014-10-171-5/+38
* | | | am 1d616c2b: Add an <application> tag to the manifestScott Kennedy2014-10-141-0/+2
|\| | | | |/ / |/| |
| * | Add an <application> tag to the manifestScott Kennedy2014-10-141-0/+2
* | | am 3ef481f3: Update themes to set status bar and nav colors.Andrew Sapperstein2014-09-183-0/+5
|\| | | |/ |/|
| * Update themes to set status bar and nav colors.Andrew Sapperstein2014-09-173-0/+5