OSDN Git Service
nicolasroard [Tue, 16 Apr 2013 23:16:25 +0000 (16:16 -0700)]
am
ccc18a73: am
03332473: Make convertBitmap() protected so that Frames can use it.
* commit '
ccc18a734f2f3de9230a09b0d31a9ce27baef000':
Make convertBitmap() protected so that Frames can use it.
nicolasroard [Tue, 16 Apr 2013 23:14:24 +0000 (16:14 -0700)]
am
03332473: Make convertBitmap() protected so that Frames can use it.
* commit '
0333247337b910bb981c6ba17ca0cc76d5b614ff':
Make convertBitmap() protected so that Frames can use it.
nicolasroard [Tue, 16 Apr 2013 22:56:35 +0000 (15:56 -0700)]
Make convertBitmap() protected so that Frames can use it.
bug:
8633011
Change-Id: Ic731a1d906a6a388a22568f396111f8ca3b4475e
nicolasroard [Tue, 16 Apr 2013 22:46:26 +0000 (15:46 -0700)]
am
d80c69a8: am
f3f0aae4: Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce
* commit '
d80c69a8398e79296e99f026e4d6e184c07dce39':
Remove the Simple Edit menu item in Gallery
nicolasroard [Tue, 16 Apr 2013 22:44:05 +0000 (15:44 -0700)]
am
f3f0aae4: Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce
* commit '
f3f0aae490911245ad6a5602b77b72f0546b93cc':
Remove the Simple Edit menu item in Gallery
nicolasroard [Tue, 16 Apr 2013 22:42:34 +0000 (22:42 +0000)]
Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce
nicolasroard [Tue, 16 Apr 2013 20:46:34 +0000 (13:46 -0700)]
Remove the Simple Edit menu item in Gallery
bug:
8609003
Change-Id: Ida6bfec65bf4b78c7c1b64f759c750ef9255bb6c
Angus Kong [Tue, 16 Apr 2013 21:55:27 +0000 (14:55 -0700)]
am
65f3514a: am
bc02d7dc: Don\'t wait for Mosaic Renderer ready in UI thread.
* commit '
65f3514aa0d91ac86927a1b5c5026c2ad3763700':
Don't wait for Mosaic Renderer ready in UI thread.
Angus Kong [Tue, 16 Apr 2013 21:49:49 +0000 (14:49 -0700)]
am
bc02d7dc: Don\'t wait for Mosaic Renderer ready in UI thread.
* commit '
bc02d7dcb2e9716a1f1e297fef435c8b0275aafe':
Don't wait for Mosaic Renderer ready in UI thread.
Angus Kong [Tue, 16 Apr 2013 20:57:06 +0000 (13:57 -0700)]
Don't wait for Mosaic Renderer ready in UI thread.
bug:
8292711
Change-Id: Ic318c353fc420c0f7e573c74814757b79c798c5d
nicolasroard [Tue, 16 Apr 2013 20:27:11 +0000 (13:27 -0700)]
nicolasroard [Tue, 16 Apr 2013 20:23:19 +0000 (13:23 -0700)]
am
fb6a8e16: New state panel
* commit '
fb6a8e166f0a46d2a994a408b1679e3a67fdcb52':
New state panel
nicolasroard [Mon, 15 Apr 2013 21:41:00 +0000 (14:41 -0700)]
New state panel
bug:
8620913
bug:
8503386
Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06
Michael Kolb [Tue, 16 Apr 2013 00:33:17 +0000 (17:33 -0700)]
am
44d3d602: am
0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryce
* commit '
44d3d6023273403a5957c7f807744602cdb84d47':
Angle menu at edge of screen
Michael Kolb [Tue, 16 Apr 2013 00:29:14 +0000 (17:29 -0700)]
am
0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryce
* commit '
0786c387413d434438257697475cf743661df296':
Angle menu at edge of screen
Michael Kolb [Tue, 16 Apr 2013 00:26:16 +0000 (00:26 +0000)]
Merge "Angle menu at edge of screen" into gb-ub-photos-bryce
Michael Kolb [Wed, 10 Apr 2013 21:16:19 +0000 (14:16 -0700)]
Angle menu at edge of screen
Bug:
8618699
Adjust touch slices; adjust label position
Change-Id: I5bbf16fc570eb9801198847991395699de89ffa3
Angus Kong [Mon, 15 Apr 2013 22:38:01 +0000 (15:38 -0700)]
am
03152021: am
f7771f98: Use extra copy of parameters for concurrent access
* commit '
0315202122c3d6b89d2597c2480b9bb81fc2ba35':
Use extra copy of parameters for concurrent access
Angus Kong [Mon, 15 Apr 2013 22:33:42 +0000 (15:33 -0700)]
am
f7771f98: Use extra copy of parameters for concurrent access
* commit '
f7771f98aed9f253048af7dd8b2a143b9258c139':
Use extra copy of parameters for concurrent access
Angus Kong [Mon, 15 Apr 2013 19:11:15 +0000 (12:11 -0700)]
Use extra copy of parameters for concurrent access
bug:
8585306
Change-Id: I21b8915c53508e4820e46b49171149189cb6012e
Michael Kolb [Mon, 15 Apr 2013 20:33:49 +0000 (13:33 -0700)]
am
baf6d4de: am
78991864: Merge "Also, add labels to video menu" into gb-ub-photos-bryce
* commit '
baf6d4de50ddfcea53ed051b9e42770afe754854':
Also, add labels to video menu
Michael Kolb [Mon, 15 Apr 2013 20:30:02 +0000 (13:30 -0700)]
am
78991864: Merge "Also, add labels to video menu" into gb-ub-photos-bryce
* commit '
789918643e2b682e387435002b5b0c287f35b39b':
Also, add labels to video menu
Michael Kolb [Mon, 15 Apr 2013 20:27:45 +0000 (20:27 +0000)]
Merge "Also, add labels to video menu" into gb-ub-photos-bryce
Michael Kolb [Mon, 15 Apr 2013 20:17:27 +0000 (13:17 -0700)]
Also, add labels to video menu
Bug:
8618169
Change-Id: Ia933db79eccf2564c785a12c8c6551fa8eb1007c
Baligh Uddin [Mon, 15 Apr 2013 20:04:36 +0000 (13:04 -0700)]
am
9219a1f4: am
a8de1aa5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
9219a1f484f41384a7bc6fc366b83df7ded721b1':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 15 Apr 2013 20:00:56 +0000 (13:00 -0700)]
am
09c275b2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
09c275b24056b6eab298d15822680ba0fb63d305':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 15 Apr 2013 19:59:47 +0000 (12:59 -0700)]
am
a8de1aa5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
a8de1aa5606cf6586876fd00913e0506f67aebce':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 15 Apr 2013 19:57:45 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 15 Apr 2013 19:57:35 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Michael Kolb [Mon, 15 Apr 2013 19:47:07 +0000 (12:47 -0700)]
am
272566d7: am
ad30f960: Merge "Add menu labels" into gb-ub-photos-bryce
* commit '
272566d783fb4a93d7148436fdb7849d380c7b68':
Add menu labels
Michael Kolb [Mon, 15 Apr 2013 19:42:39 +0000 (12:42 -0700)]
am
ad30f960: Merge "Add menu labels" into gb-ub-photos-bryce
* commit '
ad30f960879285c4dadb10d5b7531e05c345587f':
Add menu labels
Michael Kolb [Mon, 15 Apr 2013 19:40:32 +0000 (19:40 +0000)]
Merge "Add menu labels" into gb-ub-photos-bryce
Bobby Georgescu [Mon, 15 Apr 2013 19:35:49 +0000 (12:35 -0700)]
am
814c5c52: am
3dc6a630: Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce
* commit '
814c5c527b49fca0524f71ce51b152e4f3b79e6b':
Fix performance and other issues related to multi-selection
Bobby Georgescu [Mon, 15 Apr 2013 19:33:32 +0000 (12:33 -0700)]
am
3dc6a630: Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce
* commit '
3dc6a630aff5be323c54b4616fd3a373cbad31f7':
Fix performance and other issues related to multi-selection
Bobby Georgescu [Mon, 15 Apr 2013 19:30:02 +0000 (19:30 +0000)]
Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce
John Hoford [Mon, 15 Apr 2013 18:50:00 +0000 (11:50 -0700)]
am
1c8e45bf: am
d2f5fe60: support for simplified parameters in filter
* commit '
1c8e45bfb4e0f331cb40d060a4dac455032f2d45':
support for simplified parameters in filter
John Hoford [Mon, 15 Apr 2013 18:48:13 +0000 (11:48 -0700)]
am
d2f5fe60: support for simplified parameters in filter
* commit '
d2f5fe607ee6d7b5f79862b495495e2f6024cdab':
support for simplified parameters in filter
Michael Kolb [Wed, 10 Apr 2013 15:50:51 +0000 (08:50 -0700)]
Add menu labels
Bug:
8618169
Change-Id: Iea1ac7256450afd2870c144099459f32868c699f
John Hoford [Wed, 10 Apr 2013 21:58:05 +0000 (14:58 -0700)]
support for simplified parameters in filter
Change-Id: I623e6fb90e8175c7e5e2dfc146f927eecba29817
Baligh Uddin [Mon, 15 Apr 2013 18:36:35 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie192a857eb06b19ae8e7b612739a5f160e636e62
Auto-generated-cl: translation import
Baligh Uddin [Mon, 15 Apr 2013 18:36:00 +0000 (11:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib788a26efef90860ae6bf9a3ef3bd283bca99c5d
Auto-generated-cl: translation import
The Android Open Source Project [Mon, 15 Apr 2013 17:46:22 +0000 (10:46 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id113b987c3c1423d0af9464a63edcec9840cc870
The Android Automerger [Mon, 15 Apr 2013 12:56:15 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
nicolasroard [Sat, 13 Apr 2013 15:15:58 +0000 (08:15 -0700)]
am
cba8574c: am
4b6ea5bc: Add direct rendering for border
* commit '
cba8574c2b42f61a11a7e01c2f706f0c1f9cfc9c':
Add direct rendering for border
nicolasroard [Sat, 13 Apr 2013 15:12:28 +0000 (08:12 -0700)]
am
4b6ea5bc: Add direct rendering for border
* commit '
4b6ea5bce9b68eea16eb8a0980501f671e7fbf44':
Add direct rendering for border
nicolasroard [Sat, 13 Apr 2013 00:47:14 +0000 (17:47 -0700)]
Add direct rendering for border
bug:
8603245
Change-Id: Ibc1bde9adb19f930b474e4076a0c2720fbe0bc8d
Bobby Georgescu [Fri, 12 Apr 2013 22:11:39 +0000 (15:11 -0700)]
Fix performance and other issues related to multi-selection
Bug:
8606565
Bug:
8607510
Change-Id: I5bd01745b6d1047571d562e1637a2999afddfec2
Baligh Uddin [Fri, 12 Apr 2013 23:42:18 +0000 (16:42 -0700)]
am
ced505a6: am
b9db2d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
ced505a6a7364b8623849354aa3f3134bad35830':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Apr 2013 23:38:28 +0000 (16:38 -0700)]
am
6b4c389d: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
6b4c389d201cd87e49699995a8ee4d68d68af37e':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Apr 2013 23:38:03 +0000 (16:38 -0700)]
am
b9db2d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
b9db2d6aeb5b3b1d6a2335509de14612ce4453c3':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Apr 2013 23:34:18 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 12 Apr 2013 23:34:05 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Bart Sears [Fri, 12 Apr 2013 21:31:24 +0000 (14:31 -0700)]
am
cadaa899: am
4772792d: Bump up the version number to 1.1.40010
* commit '
cadaa89992808a8fca782e24f2c42c17d07dac1b':
Bump up the version number to 1.1.40010
Bart Sears [Fri, 12 Apr 2013 21:28:00 +0000 (14:28 -0700)]
am
4772792d: Bump up the version number to 1.1.40010
* commit '
4772792dbe4a29bd90139eead6a881f47523ede5':
Bump up the version number to 1.1.40010
Bart Sears [Fri, 12 Apr 2013 20:48:58 +0000 (13:48 -0700)]
Bump up the version number to 1.1.40010
Bug:
8607157
Change-Id: I4c0f4cd481d0989cad2fd9cadbda9f7768b81765
nicolasroard [Fri, 12 Apr 2013 20:22:33 +0000 (13:22 -0700)]
am
439b028e: am
93ef658b: Add a direct rendering mode
* commit '
439b028e7a74bbc56b96d43c2e58f1679207be7b':
Add a direct rendering mode
nicolasroard [Fri, 12 Apr 2013 20:18:45 +0000 (13:18 -0700)]
am
93ef658b: Add a direct rendering mode
* commit '
93ef658bf44d7ecd79894a9a225a400c2741058f':
Add a direct rendering mode
nicolasroard [Thu, 11 Apr 2013 02:27:57 +0000 (19:27 -0700)]
Add a direct rendering mode
This takes input and output allocations.
Also added a utility method in ImageFilterRS
to scale textures at screen resolution.
bug:
8603245
bug:
8588853
Change-Id: Ic5e4dea2289f0edd7518fc07f04b523be5316e82
Michael Kolb [Fri, 12 Apr 2013 17:04:32 +0000 (10:04 -0700)]
am
bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
* commit '
bacc5027e5ecfb92d6d0ba8824e878f6bea9a80e':
Add checks for NPE in video pie menu.
Baligh Uddin [Fri, 12 Apr 2013 18:20:51 +0000 (11:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I985fe436b0d183ed5aa36a3a9db826be010fb97b
Auto-generated-cl: translation import
Baligh Uddin [Fri, 12 Apr 2013 18:20:18 +0000 (11:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib9a794dd416ad278849b4a0900307f0fbdd8f927
Auto-generated-cl: translation import
Michael Kolb [Fri, 12 Apr 2013 17:10:09 +0000 (10:10 -0700)]
am
fb4605d7: am
bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
* commit '
fb4605d780396f5e6c4e5043985b460e24308758':
Add checks for NPE in video pie menu.
Michael Kolb [Fri, 12 Apr 2013 17:04:32 +0000 (10:04 -0700)]
am
bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
* commit '
bacc5027e5ecfb92d6d0ba8824e878f6bea9a80e':
Add checks for NPE in video pie menu.
Michael Kolb [Fri, 12 Apr 2013 17:00:38 +0000 (17:00 +0000)]
Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
Michael Kolb [Fri, 12 Apr 2013 16:59:41 +0000 (09:59 -0700)]
am
76193ba8: am
af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
* commit '
76193ba848ca9d146360224522835d2347e899c0':
Fix NPE in PieRenderer
Michael Kolb [Fri, 12 Apr 2013 16:54:18 +0000 (09:54 -0700)]
am
af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
* commit '
af998215b46e2b0ffaa2a47a762ba78f7c522e60':
Fix NPE in PieRenderer
Doris Liu [Fri, 12 Apr 2013 16:52:56 +0000 (09:52 -0700)]
am
2bcea6d6: am
d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
* commit '
2bcea6d69ba09568a4d64fb14fc062c04a8ab8b8':
Fix ICS recording aspect ratio
Michael Kolb [Fri, 12 Apr 2013 16:51:57 +0000 (16:51 +0000)]
Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
Doris Liu [Fri, 12 Apr 2013 16:50:11 +0000 (09:50 -0700)]
am
d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
* commit '
d8259c06a0ed459eb937cf3bd3ddd79db1ea2533':
Fix ICS recording aspect ratio
Doris Liu [Fri, 12 Apr 2013 16:47:05 +0000 (16:47 +0000)]
Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
Michael Kolb [Fri, 12 Apr 2013 15:45:25 +0000 (08:45 -0700)]
Fix NPE in PieRenderer
Bug:
8579025
Change-Id: I1faaa4fc8a48e6abedca303e80dbf48d7b5e7574
Ruben Brunk [Fri, 12 Apr 2013 03:40:29 +0000 (20:40 -0700)]
am
eb0347b9: am
6cfb081c: G+ crop overlay shadows. Aspect ratios.
* commit '
eb0347b95eb58fca649aa13c533775d19fd57927':
G+ crop overlay shadows. Aspect ratios.
Ruben Brunk [Fri, 12 Apr 2013 03:37:44 +0000 (20:37 -0700)]
am
6cfb081c: G+ crop overlay shadows. Aspect ratios.
* commit '
6cfb081cdf5acf454ecb05c50c575bcb3ce74cf0':
G+ crop overlay shadows. Aspect ratios.
Ruben Brunk [Fri, 12 Apr 2013 01:01:25 +0000 (18:01 -0700)]
G+ crop overlay shadows. Aspect ratios.
Bug:
8597538
Change-Id: I9a7225a125bef7e11d6bf420bf1fa55e7f22c909
Jason Noguchi [Fri, 12 Apr 2013 00:39:20 +0000 (17:39 -0700)]
Add checks for NPE in video pie menu.
Bug:
8536361
Change-Id: Iabd818e4e9fadf1f36ffed894ca7248f9568e6c9
Doris Liu [Wed, 10 Apr 2013 18:52:40 +0000 (11:52 -0700)]
Fix ICS recording aspect ratio
Change-Id: I092a4303959b1b3cee870c891070e2605ab9e0b0
Bobby Georgescu [Thu, 11 Apr 2013 23:00:58 +0000 (16:00 -0700)]
am
0fc0fbf1: am
e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce
* commit '
0fc0fbf14b8113b2655ae798ef9d7616f37f0d68':
Show loading indicator in full-screen importer view
Bobby Georgescu [Thu, 11 Apr 2013 22:56:11 +0000 (15:56 -0700)]
am
e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce
* commit '
e51f236bfcc617979871f0be7ce46691cf5415c8':
Show loading indicator in full-screen importer view
Bobby Georgescu [Thu, 11 Apr 2013 22:52:42 +0000 (22:52 +0000)]
Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce
Angus Kong [Thu, 11 Apr 2013 22:49:00 +0000 (15:49 -0700)]
am
bdb35784: am
2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce
* commit '
bdb3578486870647fe24d8bae74eaed552d6527b':
Integrate FilmStripView.
Bobby Georgescu [Thu, 11 Apr 2013 22:34:00 +0000 (15:34 -0700)]
Show loading indicator in full-screen importer view
Bug:
8599282
Change-Id: I568d5077e8e5450da49cd4d75df39973b84d081f
Angus Kong [Thu, 11 Apr 2013 22:45:03 +0000 (15:45 -0700)]
am
2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce
* commit '
2634fe5fb34ed749d25c0e13113a9ba6c6e8cf90':
Integrate FilmStripView.
Angus Kong [Thu, 11 Apr 2013 22:42:12 +0000 (22:42 +0000)]
Merge "Integrate FilmStripView." into gb-ub-photos-bryce
George Mount [Thu, 11 Apr 2013 20:56:12 +0000 (13:56 -0700)]
am
85233f2c: am
34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce
* commit '
85233f2c08759aa4731314899dbe43cfc16adc6f':
Add _COUNT support for PhotoProvider to help performance of All Photos.
George Mount [Thu, 11 Apr 2013 20:54:37 +0000 (13:54 -0700)]
am
34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce
* commit '
34a50f0c3db6890e857abc68f5b9280f95c14d2e':
Add _COUNT support for PhotoProvider to help performance of All Photos.
George Mount [Thu, 11 Apr 2013 20:52:32 +0000 (20:52 +0000)]
Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce
Ruben Brunk [Thu, 11 Apr 2013 20:30:48 +0000 (13:30 -0700)]
am
f2b05458: am
ea2fa83c: Setup geometry xforms and propogation chain.
* commit '
f2b0545806a679e38e230233c80080a5d9c24033':
Setup geometry xforms and propogation chain.
Ruben Brunk [Thu, 11 Apr 2013 20:27:18 +0000 (13:27 -0700)]
am
ea2fa83c: Setup geometry xforms and propogation chain.
* commit '
ea2fa83c2dd2b59b8a67ec363e4ac431748f997b':
Setup geometry xforms and propogation chain.
Ruben Brunk [Thu, 11 Apr 2013 19:39:03 +0000 (12:39 -0700)]
Setup geometry xforms and propogation chain.
Bug:
8597538
Change-Id: I4a6b8ebcfadfd30850a73217742c740835761388
Angus Kong [Tue, 9 Apr 2013 22:02:59 +0000 (15:02 -0700)]
Integrate FilmStripView.
Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d
George Mount [Tue, 9 Apr 2013 20:45:09 +0000 (13:45 -0700)]
Add _COUNT support for PhotoProvider to help performance of All Photos.
Bug
8594818
Change-Id: Iab14a945e33ffcbf539b1d7acc704538e4bf48b6
Doris Liu [Thu, 11 Apr 2013 17:11:48 +0000 (10:11 -0700)]
am
901b8e1a: am
1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce
* commit '
901b8e1abb5d53db44abfcfe44168e0cdc45a902':
Fix camera preview being squished
Doris Liu [Thu, 11 Apr 2013 17:09:47 +0000 (10:09 -0700)]
am
1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce
* commit '
1f60d9cd60e01da716a736803994ce14016947ac':
Fix camera preview being squished
Doris Liu [Thu, 11 Apr 2013 17:07:25 +0000 (17:07 +0000)]
Merge "Fix camera preview being squished" into gb-ub-photos-bryce
The Android Open Source Project [Thu, 11 Apr 2013 14:45:23 +0000 (07:45 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I04fc3a249c15bac81c330ad09fd9edeca78b784f
The Android Automerger [Thu, 11 Apr 2013 12:55:54 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ruben Brunk [Thu, 11 Apr 2013 03:44:20 +0000 (20:44 -0700)]
am
8c18867c: am
41185c4f: Fix downsampling check in crop.
* commit '
8c18867c4dce46eb80ba02732a3cbe0c420e6a64':
Fix downsampling check in crop.
Ruben Brunk [Thu, 11 Apr 2013 03:40:41 +0000 (20:40 -0700)]
am
41185c4f: Fix downsampling check in crop.
* commit '
41185c4fdbccad17b79697306a7f8044b8f7ffd3':
Fix downsampling check in crop.
Ruben Brunk [Thu, 11 Apr 2013 00:27:33 +0000 (17:27 -0700)]
Fix downsampling check in crop.
Bug:
8586301
Change-Id: I4c5441f779122adb984368609cfea39a60190848
Doris Liu [Wed, 10 Apr 2013 23:43:43 +0000 (16:43 -0700)]
Fix camera preview being squished
Bug:
8585407
Change-Id: Ie9a3a44c58599f4cccfa0017d48749e9883af6cd