summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '289306f103b181378d5d58850cf61495facc3204' into HEADThe Android Open Source Project2013-11-22874-130681/+24929
|\
| * am b8f36242: am a88cf82c: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\
| | * am a88cf82c: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| | |\
| | | * merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| | | |\
| | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-160-0/+0
| | | | |\
| | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-150-0/+0
| | | | | |\
| | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-150-0/+0
| | | | | | |\
| | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-140-0/+0
| | | | | | | |\
| | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-100-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-090-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-080-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-060-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-030-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-010-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * Rename Gallery activity and add trampolineMangesh Ghiware2013-09-2716-279/+330
| | | | | | | | | | | | | | | * enable change in printingJohn Hoford2013-09-261-3/+14
| | | | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-260-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-250-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-240-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-220-0/+0
| | | | | | | | | | | | | | | | | | |\
| * | | | | | | | | | | | | | | | | | | am 556a015d: am 19b2236c: am c0247a59: updated camera launcher icon in Galler...Ari Sachter-Zeltzer2013-10-165-0/+0
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | am 19b2236c: am c0247a59: updated camera launcher icon in Gallery2 package as...Ari Sachter-Zeltzer2013-10-165-0/+0
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | am c0247a59: updated camera launcher icon in Gallery2 package as wellAri Sachter-Zeltzer2013-10-165-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | updated camera launcher icon in Gallery2 package as wellAri Sachter-Zeltzer2013-10-165-0/+0
| * | | | | | | | | | | | | | | | | | | am 4460df7c: am efa8ae01: am 1582e5df: Merge "Update Gallery2 camera launcher...Alan Newberger2013-10-155-0/+0
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | am efa8ae01: am 1582e5df: Merge "Update Gallery2 camera launchers" into gb-ub...Alan Newberger2013-10-155-0/+0
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | am 1582e5df: Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbadAlan Newberger2013-10-155-0/+0
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbadAlan Newberger2013-10-165-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | Update Gallery2 camera launchersAlan Newberger2013-10-155-0/+0
| * | | | | | | | | | | | | | | | | | | | am c41bf6c0: am 48265373: am 1b56a245: Merge "Fix Gallery auto-hide action ba...nicolasroard2013-10-151-0/+1
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | am 48265373: am 1b56a245: Merge "Fix Gallery auto-hide action bar in Album vi...nicolasroard2013-10-151-0/+1
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | am 1b56a245: Merge "Fix Gallery auto-hide action bar in Album view" into gb-u...nicolasroard2013-10-151-0/+1
| | | |\| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos-carl...nicolasroard2013-10-161-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | Fix Gallery auto-hide action bar in Album viewnicolasroard2013-10-151-0/+1
| * | | | | | | | | | | | | | | | | | | | | am 62cd0cfc: am 50427582: am 2037f39b: Merge "Fix crash "Gallery has stopped"...nicolasroard2013-10-152-2/+2
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | am 50427582: am 2037f39b: Merge "Fix crash "Gallery has stopped" popup occurs...nicolasroard2013-10-152-2/+2
| | |\| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | am 2037f39b: Merge "Fix crash "Gallery has stopped" popup occurs during print...nicolasroard2013-10-152-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | |_|_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into ...nicolasroard2013-10-162-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | Fix crash "Gallery has stopped" popup occurs during print setupnicolasroard2013-10-152-2/+2
| | | | | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 30655083: am 11bf46c0: am a4f2389c: Catch all the exceptions.Mangesh Ghiware2013-10-151-0/+4
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | am 11bf46c0: am a4f2389c: Catch all the exceptions.Mangesh Ghiware2013-10-151-0/+4
| | |\| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | am a4f2389c: Catch all the exceptions.Mangesh Ghiware2013-10-151-0/+4
| | | |\| | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Catch all the exceptions.Mangesh Ghiware2013-10-151-0/+4
| | | | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 1214470a: am 94678fc1: am db30124a: Merge "Revert "Play the video on top o...Tenghui Zhu2013-10-141-1/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am 94678fc1: am db30124a: Merge "Revert "Play the video on top of lock screen...Tenghui Zhu2013-10-141-1/+0
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | am db30124a: Merge "Revert "Play the video on top of lock screen"" into gb-ub...Tenghui Zhu2013-10-141-1/+0
| | | |\| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbadTenghui Zhu2013-10-141-1/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | Revert "Play the video on top of lock screen"Tenghui Zhu2013-10-141-1/+0
| * | | | | | | | | | | | | | | | | | am 74ea45fa: am 8cee8116: am 5169137f: fix Vignette collapse to a lineJohn Hoford2013-10-141-0/+2
| |\| | | | | | | | | | | | | | | | |