android_packages_apps_Gallery2 - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	am ab56fe17: am 59afb28f: am fd55ffec: Fix for translation strings	nicolasroard	2013-08-13	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	* commit 'ab56fe1721e292228096dc75c252497e61105463': Fix for translation strings
\| *	am 59afb28f: am fd55ffec: Fix for translation strings	nicolasroard	2013-08-13	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	* commit '59afb28fece7333ba61bbf1738a70657f3884ef1': Fix for translation strings
\| \| *	am fd55ffec: Fix for translation strings	nicolasroard	2013-08-13	1	-1/+1
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'fd55ffec5dbec1d37e4e8b32240bd51c7e85275b': Fix for translation strings
\| \| \| *	Fix for translation strings	nicolasroard	2013-08-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I2c89a377a8a439dd7b77d09a1362c4d6e68752df
* \| \| \|	am 66fe6472: am 627164c5: am 9977d45f: Merge "Fix tablet UI layout" into ↵	nicolasroard	2013-08-13	10	-72/+84
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gb-ub-photos-carlsbad * commit '66fe647204c5bd1a4d4720fad3af89b881e9ac51': Fix tablet UI layout
\| * \| \|	am 627164c5: am 9977d45f: Merge "Fix tablet UI layout" into ↵	nicolasroard	2013-08-13	10	-72/+84
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gb-ub-photos-carlsbad * commit '627164c5d02c33c8a4224d34d0cabcd5c19951a0': Fix tablet UI layout
\| \| * \|	am 9977d45f: Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad	nicolasroard	2013-08-13	10	-72/+84
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '9977d45fcae932581c1788cf3fa96a3f4040a8dc': Fix tablet UI layout
\| \| \| *	Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad	nicolasroard	2013-08-13	10	-72/+84
\| \| \| \|\
\| \| \| \| *	Fix tablet UI layout	nicolasroard	2013-08-13	10	-72/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I19a6f6751dd7754e8b0de6eb22a82041b1dff29f
* \| \| \| \|	am 657f0a82: am 68b65c98: am dbc7f587: Merge "fix draw size and style ↵	John Hoford	2013-08-13	7	-15/+200
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	display" into gb-ub-photos-carlsbad * commit '657f0a82ba3583a408d5be03785982b224932507': fix draw size and style display
\| * \| \| \|	am 68b65c98: am dbc7f587: Merge "fix draw size and style display" into ↵	John Hoford	2013-08-13	7	-15/+200
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gb-ub-photos-carlsbad * commit '68b65c983e31b7a9923abb2eed5e8d736ddf7425': fix draw size and style display
\| \| * \| \|	am dbc7f587: Merge "fix draw size and style display" into gb-ub-photos-carlsbad	John Hoford	2013-08-13	7	-15/+200
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'dbc7f5878da3038fbe96609ad21b5324e9645367': fix draw size and style display
\| \| \| * \|	Merge "fix draw size and style display" into gb-ub-photos-carlsbad	John Hoford	2013-08-13	7	-15/+200
\| \| \| \|\ \
\| \| \| \| * \|	fix draw size and style display	John Hoford	2013-08-13	7	-15/+200
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ia7419e0f03e48fd099b678aa81c351462ee6937a
* \| \| \| \| \|	am 69b22f7e: am 0581bac4: am 389e8c88: Remove old video camera icon and ↵	Doris Liu	2013-08-13	3	-3/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	label from Gallery * commit '69b22f7eda0db8354109a96d1bdfd349e3e35a18': Remove old video camera icon and label from Gallery
\| * \| \| \| \|	am 0581bac4: am 389e8c88: Remove old video camera icon and label from Gallery	Doris Liu	2013-08-13	3	-3/+0
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '0581bac494204a2dd5f246872d14691d562faa4b': Remove old video camera icon and label from Gallery
\| \| * \| \| \|	am 389e8c88: Remove old video camera icon and label from Gallery	Doris Liu	2013-08-13	3	-3/+0
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '389e8c887489db88e9324c17e8d29363198e7221': Remove old video camera icon and label from Gallery
\| \| \| * \| \|	Remove old video camera icon and label from Gallery	Doris Liu	2013-08-13	3	-3/+0
\| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 10296343 Change-Id: I677f5b97919ea235ac9148ca92eee2af13bc462e
* \| \| \| \|	am 6f8d98ba: am 9ad51bd2: am c41fdd6f: Merge "Fix icons rendering to be ↵	nicolasroard	2013-08-13	5	-126/+258
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	consistent" into gb-ub-photos-carlsbad * commit '6f8d98ba0a81e8ab39bed23406d33f170c7bd3ce': Fix icons rendering to be consistent
\| * \| \| \|	am 9ad51bd2: am c41fdd6f: Merge "Fix icons rendering to be consistent" into ↵	nicolasroard	2013-08-13	5	-126/+258
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gb-ub-photos-carlsbad * commit '9ad51bd2f4ad081b00281d51e257352bf9378147': Fix icons rendering to be consistent
\| \| * \| \|	am c41fdd6f: Merge "Fix icons rendering to be consistent" into ↵	nicolasroard	2013-08-13	5	-126/+258
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gb-ub-photos-carlsbad * commit 'c41fdd6f37df5dbd7f44b1c79cdd6d025937209d': Fix icons rendering to be consistent
\| \| \| * \|	Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad	nicolasroard	2013-08-13	5	-126/+258
\| \| \| \|\ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| \| *	Fix icons rendering to be consistent	nicolasroard	2013-08-13	5	-126/+258
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ie9384df9a34a39311dfe7ccc1cff1250d2f3918e
* \| \| \| \|	am 9b57886d: am c3606508: am 0bdafb19: Merge "add circle brush" into ↵	John Hoford	2013-08-13	4	-8/+12
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gb-ub-photos-carlsbad * commit '9b57886d0f6eba16a258cea1568a4c6d2ec4473c': add circle brush
\| * \| \| \|	am c3606508: am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad	John Hoford	2013-08-13	4	-8/+12
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'c3606508cecf94cfde3f1a927ab926f414b83ac0': add circle brush
\| \| * \| \|	am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad	John Hoford	2013-08-13	4	-8/+12
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '0bdafb193e49e2b89eeb9f4c197bbc60635c6419': add circle brush
\| \| \| * \|	Merge "add circle brush" into gb-ub-photos-carlsbad	John Hoford	2013-08-13	4	-8/+12
\| \| \| \|\ \
\| \| \| \| * \|	add circle brush	John Hoford	2013-08-12	4	-8/+12
\| \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Iee5bc138599853b9c5343ae2e6f02b22ea4abe2d
* \| \| \| \|	Merge "Import translations. DO NOT MERGE"	Baligh Uddin	2013-08-13	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2013-08-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ia6b1d3673eeb65cfb84926820b9e7753624b073e Auto-generated-cl: translation import
* \| \| \| \| \|	am d1b3e27b: (-s ours) am 4c89ec75: am 1b02bf12: (-s ours) DO NOT MERGE Fix ↵	Stephen Hines	2013-08-12	0	-0/+0
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	build break by not redefining LOCAL_SHARED_LIBRARIES. * commit 'd1b3e27b8028ee1afcc3b34e8d7b7990849131bd': DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.
\| * \| \| \| \|	am 4c89ec75: am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not ↵	Stephen Hines	2013-08-12	0	-0/+0
\|/\| \| \| \| \| \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	redefining LOCAL_SHARED_LIBRARIES. * commit '4c89ec75151c28a905602b79f125583eba6edcd5': DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.
\| * \| \| \|	am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining ↵	Stephen Hines	2013-08-12	0	-0/+0
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LOCAL_SHARED_LIBRARIES. * commit '1b02bf1271af9d0f90e07ef2dd57fffd246f3b37': DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.
\| \| * \| \|	DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.	Stephen Hines	2013-08-12	1	-4/+0
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	Change-Id: I3f063cc9688fce7d22805d4dda512d486d0c1218
* \| \| \|	am 366c2ed3: Remove the unused libcutils.	Ying Wang	2013-08-12	1	-4/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '366c2ed307e91ad1fa22554cff3a95c50c12402e': Remove the unused libcutils.
\| * \| \|	Remove the unused libcutils.	Ying Wang	2013-08-12	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I91b3143f0959e194b71c66ef79f37c35f7a29499
* \| \| \|	am c20802f0: Remove all the tests from Gallery2 until we have them sorted out.	Sascha Haeberling	2013-08-12	52	-9242/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'c20802f0342125eea7d50cb313678faf5e16ca0e': Remove all the tests from Gallery2 until we have them sorted out.
\| * \| \|	Remove all the tests from Gallery2 until we have them sorted out.	Sascha Haeberling	2013-08-12	52	-9242/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I72e3f0ce477f0b0d5bca1f53feba21b6aa77e315
* \| \| \|	Merge remote-tracking branch 'origin/klp-dev-plus-aosp' into klp-dev-plus-aosp	Qiwen Zhao	2013-08-12	0	-0/+0
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	am 95599b51: am 77306b68: am 4772792d: Bump up the version number to 1.1.40010	Bart Sears	2013-08-12	0	-0/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '95599b519feaa601acfcefa2fa2183610bf87ce7':
\| * \ \ \	am 813b3fcc: am 5744809c: am 93ef658b: Add a direct rendering mode	nicolasroard	2013-08-12	0	-0/+0
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '813b3fccb5377d1f132d22a312be4b4c5a49ea23':
\| * \ \ \ \	am 86dcd3b5: am 3019162b: am bacc5027: Merge "Add checks for NPE in video ↵	Michael Kolb	2013-08-12	0	-0/+0
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pie menu." into gb-ub-photos-bryce * commit '86dcd3b596d3ac85c81c19632ce788f7389ab469':
\| * \ \ \ \ \	am a7794263: am 0553910d: am af998215: Merge "Fix NPE in PieRenderer" into ↵	Michael Kolb	2013-08-12	0	-0/+0
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gb-ub-photos-bryce * commit 'a77942630ca7f3b0ea472f9806390977809e4e03':
\| * \ \ \ \ \ \	am 1e22d9bd: am edddcab2: am d8259c06: Merge "Fix ICS recording aspect ↵	Doris Liu	2013-08-12	0	-0/+0
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ratio" into gb-ub-photos-bryce * commit '1e22d9bdda7285053ac0b57d43cef041575cc94f':
\| * \ \ \ \ \ \ \	am a6ff1663: am f007ac89: am 6cfb081c: G+ crop overlay shadows. Aspect ratios.	Ruben Brunk	2013-08-12	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'a6ff1663887e0e6e9fc3a60b51415f6f7873f2fe':
\| * \ \ \ \ \ \ \ \	am 73bfca6f: am e66f4aba: am e51f236b: Merge "Show loading indicator in ↵	Bobby Georgescu	2013-08-12	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	full-screen importer view" into gb-ub-photos-bryce * commit '73bfca6f82745ff3a52f7ac03faa734b9f5d6860':
\| * \ \ \ \ \ \ \ \ \	am a9187510: am 115e8693: am 2634fe5f: Merge "Integrate FilmStripView." into ↵	Angus Kong	2013-08-12	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gb-ub-photos-bryce * commit 'a9187510448d4e5d2239ed06c137aa2d3cc0a096':
\| * \ \ \ \ \ \ \ \ \ \	am a0ee88a4: am 0e4ba348: am 34a50f0c: Merge "Add _COUNT support for ↵	George Mount	2013-08-12	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce * commit 'a0ee88a40a618a514d99429d04146b64a264e3ad':
\| * \ \ \ \ \ \ \ \ \ \ \	am 4f087b99: am 207b436c: am ea2fa83c: Setup geometry xforms and propogation ↵	Ruben Brunk	2013-08-12	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	chain. * commit '4f087b99b8a3ab50aea097896910ca897047c62d':
\| * \ \ \ \ \ \ \ \ \ \ \ \	am f141351d: am 5875c082: am 1f60d9cd: Merge "Fix camera preview being ↵	Doris Liu	2013-08-12	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	squished" into gb-ub-photos-bryce * commit 'f141351d0008e885889e28f9773b6ba65c1951ee':