summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am ab56fe17: am 59afb28f: am fd55ffec: Fix for translation stringsnicolasroard2013-08-131-1/+1
|\
| * am 59afb28f: am fd55ffec: Fix for translation stringsnicolasroard2013-08-131-1/+1
| |\
| | * am fd55ffec: Fix for translation stringsnicolasroard2013-08-131-1/+1
| | |\
| | | * Fix for translation stringsnicolasroard2013-08-131-1/+1
* | | | am 66fe6472: am 627164c5: am 9977d45f: Merge "Fix tablet UI layout" into gb-u...nicolasroard2013-08-1310-72/+84
|\| | |
| * | | am 627164c5: am 9977d45f: Merge "Fix tablet UI layout" into gb-ub-photos-carl...nicolasroard2013-08-1310-72/+84
| |\| |
| | * | am 9977d45f: Merge "Fix tablet UI layout" into gb-ub-photos-carlsbadnicolasroard2013-08-1310-72/+84
| | |\|
| | | * Merge "Fix tablet UI layout" into gb-ub-photos-carlsbadnicolasroard2013-08-1310-72/+84
| | | |\
| | | | * Fix tablet UI layoutnicolasroard2013-08-1310-72/+84
* | | | | am 657f0a82: am 68b65c98: am dbc7f587: Merge "fix draw size and style display...John Hoford2013-08-137-15/+200
|\| | | |
| * | | | am 68b65c98: am dbc7f587: Merge "fix draw size and style display" into gb-ub-...John Hoford2013-08-137-15/+200
| |\| | |
| | * | | am dbc7f587: Merge "fix draw size and style display" into gb-ub-photos-carlsbadJohn Hoford2013-08-137-15/+200
| | |\| |
| | | * | Merge "fix draw size and style display" into gb-ub-photos-carlsbadJohn Hoford2013-08-137-15/+200
| | | |\ \
| | | | * | fix draw size and style displayJohn Hoford2013-08-137-15/+200
* | | | | | am 69b22f7e: am 0581bac4: am 389e8c88: Remove old video camera icon and label...Doris Liu2013-08-133-3/+0
|\| | | | |
| * | | | | am 0581bac4: am 389e8c88: Remove old video camera icon and label from GalleryDoris Liu2013-08-133-3/+0
| |\| | | |
| | * | | | am 389e8c88: Remove old video camera icon and label from GalleryDoris Liu2013-08-133-3/+0
| | |\| | |
| | | * | | Remove old video camera icon and label from GalleryDoris Liu2013-08-133-3/+0
| | | | |/ | | | |/|
* | | | | am 6f8d98ba: am 9ad51bd2: am c41fdd6f: Merge "Fix icons rendering to be consi...nicolasroard2013-08-135-126/+258
|\| | | |
| * | | | am 9ad51bd2: am c41fdd6f: Merge "Fix icons rendering to be consistent" into g...nicolasroard2013-08-135-126/+258
| |\| | |
| | * | | am c41fdd6f: Merge "Fix icons rendering to be consistent" into gb-ub-photos-c...nicolasroard2013-08-135-126/+258
| | |\| |
| | | * | Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbadnicolasroard2013-08-135-126/+258
| | | |\ \ | | | | |/ | | | |/|
| | | | * Fix icons rendering to be consistentnicolasroard2013-08-135-126/+258
* | | | | am 9b57886d: am c3606508: am 0bdafb19: Merge "add circle brush" into gb-ub-ph...John Hoford2013-08-134-8/+12
|\| | | |
| * | | | am c3606508: am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbadJohn Hoford2013-08-134-8/+12
| |\| | |
| | * | | am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbadJohn Hoford2013-08-134-8/+12
| | |\| |
| | | * | Merge "add circle brush" into gb-ub-photos-carlsbadJohn Hoford2013-08-134-8/+12
| | | |\ \
| | | | * | add circle brushJohn Hoford2013-08-124-8/+12
| | | | |/
* | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-08-131-1/+1
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-08-121-1/+1
* | | | | | am d1b3e27b: (-s ours) am 4c89ec75: am 1b02bf12: (-s ours) DO NOT MERGE Fix b...Stephen Hines2013-08-120-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 4c89ec75: am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redef...Stephen Hines2013-08-120-0/+0
|/| | | | | | | |/ / / | |/| | |
| * | | | am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining LOCAL_S...Stephen Hines2013-08-120-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.Stephen Hines2013-08-121-4/+0
| | | |/ | | |/|
* | | | am 366c2ed3: Remove the unused libcutils.Ying Wang2013-08-121-4/+0
|\| | |
| * | | Remove the unused libcutils.Ying Wang2013-08-121-4/+0
* | | | am c20802f0: Remove all the tests from Gallery2 until we have them sorted out.Sascha Haeberling2013-08-1252-9242/+0
|\| | |
| * | | Remove all the tests from Gallery2 until we have them sorted out.Sascha Haeberling2013-08-1252-9242/+0
* | | | Merge remote-tracking branch 'origin/klp-dev-plus-aosp' into klp-dev-plus-aospQiwen Zhao2013-08-120-0/+0
|\ \ \ \ | |/ / / |/| | |
| * | | am 95599b51: am 77306b68: am 4772792d: Bump up the version number to 1.1.40010Bart Sears2013-08-120-0/+0
| |\ \ \
| * \ \ \ am 813b3fcc: am 5744809c: am 93ef658b: Add a direct rendering modenicolasroard2013-08-120-0/+0
| |\ \ \ \
| * \ \ \ \ am 86dcd3b5: am 3019162b: am bacc5027: Merge "Add checks for NPE in video pie...Michael Kolb2013-08-120-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ am a7794263: am 0553910d: am af998215: Merge "Fix NPE in PieRenderer" into gb...Michael Kolb2013-08-120-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 1e22d9bd: am edddcab2: am d8259c06: Merge "Fix ICS recording aspect ratio"...Doris Liu2013-08-120-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am a6ff1663: am f007ac89: am 6cfb081c: G+ crop overlay shadows. Aspect ratios.Ruben Brunk2013-08-120-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 73bfca6f: am e66f4aba: am e51f236b: Merge "Show loading indicator in full-...Bobby Georgescu2013-08-120-0/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am a9187510: am 115e8693: am 2634fe5f: Merge "Integrate FilmStripView." into ...Angus Kong2013-08-120-0/+0
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am a0ee88a4: am 0e4ba348: am 34a50f0c: Merge "Add _COUNT support for PhotoPro...George Mount2013-08-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 4f087b99: am 207b436c: am ea2fa83c: Setup geometry xforms and propogation ...Ruben Brunk2013-08-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am f141351d: am 5875c082: am 1f60d9cd: Merge "Fix camera preview being squish...Doris Liu2013-08-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \