git.osdn.net Git - android-x86/packages-apps-Gallery2.git/log

The Android Open Source Project [Fri, 17 May 2013 19:59:41 +0000 (12:59 -0700)]

am aecc1998: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'aecc1998647fc33822a8e5c55673c8f45ec466e7':

commit | commitdiff | tree

The Android Open Source Project [Fri, 17 May 2013 19:54:44 +0000 (12:54 -0700)]

Reconcile with jb-mr2-release - do not merge

Change-Id: I6c8f974fdf7022bfe1cc0ca00a3cf1466d641428

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 23:03:31 +0000 (16:03 -0700)]

am 72b6bd03: am 8d07b582: am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce

* commit '72b6bd030c21553f32073790ac8276111ac4e684':
Switch back to old crop

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 23:00:50 +0000 (16:00 -0700)]

am 8d07b582: am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce

* commit '8d07b582341df0262eda91da7fbed5938bdd2337':
Switch back to old crop

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 22:59:23 +0000 (15:59 -0700)]

am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce

* commit '3b7347daf572c20996607afe4cc32f9a96f8fe5d':
Switch back to old crop

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 22:58:09 +0000 (22:58 +0000)]

Merge "Switch back to old crop" into gb-ub-photos-bryce

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 22:18:50 +0000 (15:18 -0700)]

Switch back to old crop

Bug: 8950255

Change-Id: I3f78901e65a17a1d5867d3f76a6031cff5f65fed

commit | commitdiff | tree

Michael Kolb [Thu, 16 May 2013 21:36:01 +0000 (14:36 -0700)]

am 6d86f3d3: am 1420dea3: am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce

* commit '6d86f3d361d28679cfe5da08dcb7f4356f13558a':
Add new overlay icons for sharpen and curves

commit | commitdiff | tree

Michael Kolb [Thu, 16 May 2013 21:34:01 +0000 (14:34 -0700)]

am 1420dea3: am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce

* commit '1420dea329586ad491ea93a90a59d0d78b28d953':
Add new overlay icons for sharpen and curves

commit | commitdiff | tree

Michael Kolb [Thu, 16 May 2013 21:32:42 +0000 (14:32 -0700)]

am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce

* commit '5f30afbeea7d6f6f05df9e8a50b64c5cd0cc9cca':
Add new overlay icons for sharpen and curves

commit | commitdiff | tree

Michael Kolb [Thu, 16 May 2013 21:31:31 +0000 (21:31 +0000)]

Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce

commit | commitdiff | tree

Michael Kolb [Thu, 16 May 2013 21:07:29 +0000 (14:07 -0700)]

Add new overlay icons for sharpen and curves

Bug: 8791729

Change-Id: Ife86e0a22fb270df2f2f0a699f103ece5e9e9f1b

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 21:05:16 +0000 (14:05 -0700)]

am 42423914: am 5c95e49f: am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce

* commit '4242391413fe3b5e12502794cefc7caf689e3044':
toUpper() some strings

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 21:02:47 +0000 (14:02 -0700)]

am 5c95e49f: am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce

* commit '5c95e49faad25acca47639ed97ada8b50567793e':
toUpper() some strings

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 21:01:30 +0000 (14:01 -0700)]

am 2c596d7f: am 80835b0a: am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce

* commit '2c596d7f5988c942774fb9f8044162b4149f9ab2':
Fix reset

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 20:59:20 +0000 (13:59 -0700)]

am 80835b0a: am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce

* commit '80835b0aa14ad477adf3f23b69b2bf7c83fe0c20':
Fix reset

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 20:58:02 +0000 (13:58 -0700)]

am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce

* commit '75084da1b34e0ff9f269b5409d206c213532edbc':
toUpper() some strings

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 20:56:29 +0000 (20:56 +0000)]

Merge "toUpper() some strings" into gb-ub-photos-bryce

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 20:54:50 +0000 (13:54 -0700)]

am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce

* commit '5a9716fe6de7af4585a24dd1d749b38a4ab48195':
Fix reset

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 20:52:31 +0000 (20:52 +0000)]

Merge "Fix reset" into gb-ub-photos-bryce

commit | commitdiff | tree

John Reck [Thu, 16 May 2013 20:50:50 +0000 (13:50 -0700)]

toUpper() some strings

Bug: 8791729

Change-Id: Icd05eb2d33b83fb589470ef9d98585f919f14deb

commit | commitdiff | tree

John Hoford [Thu, 16 May 2013 20:50:00 +0000 (13:50 -0700)]

am 78f2d565: am c792b72a: am fef58a0f: change edit icon

* commit '78f2d565bf309c9a2fe2006d66d488e2b62603b7':
change edit icon

commit | commitdiff | tree

John Hoford [Thu, 16 May 2013 20:48:04 +0000 (13:48 -0700)]

am c792b72a: am fef58a0f: change edit icon

* commit 'c792b72a0b2394cdd8648ad867a0a36f0ad937f4':
change edit icon

commit | commitdiff | tree

John Hoford [Thu, 16 May 2013 20:46:27 +0000 (13:46 -0700)]

am fef58a0f: change edit icon

* commit 'fef58a0fc969cc09b02cb9945da8d553698681e3':
change edit icon

commit | commitdiff | tree

John Hoford [Thu, 16 May 2013 19:55:21 +0000 (12:55 -0700)]

change edit icon

bug:8988179
Change-Id: I57516d154e56cd694f8e76bc38774bdf7f9e5df0

commit | commitdiff | tree

The Android Automerger [Thu, 16 May 2013 12:55:41 +0000 (05:55 -0700)]

merge in jb-mr2-release history after reset to jb-mr2-dev

commit | commitdiff | tree

The Android Open Source Project [Thu, 16 May 2013 12:48:14 +0000 (05:48 -0700)]

am cd168d34: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'cd168d344fe9c36ea31505939af5fcb925e5acd7':
am a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce
am c3178ca4: Gallery crop uses new activity. Fixed image quality.

commit | commitdiff | tree

The Android Open Source Project [Thu, 16 May 2013 12:44:03 +0000 (05:44 -0700)]

Reconcile with jb-mr2-release - do not merge

Change-Id: I232af0988b3526fbc5d309397c361556fb7b09e7

commit | commitdiff | tree

John Reck [Wed, 15 May 2013 21:45:34 +0000 (14:45 -0700)]

Fix reset

Bug: 8791729

Change-Id: Id39ef76f013a38bae3d92f45b02de7cd184edfec

commit | commitdiff | tree

Michael Kolb [Wed, 15 May 2013 20:37:28 +0000 (13:37 -0700)]

am 04d95221: am f8d78d2f: am c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce

* commit '04d952217a2dd51b86ddecbe4dc56f98329d78a2':
Grey out undo/redo/reset according to state

commit | commitdiff | tree

Michael Kolb [Wed, 15 May 2013 20:37:27 +0000 (13:37 -0700)]

am 7c83eba2: am da046959: am 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-bryce

* commit '7c83eba291774d906abac828f0465643e932f819':
Correct label position after rotation

commit | commitdiff | tree

ztenghui [Wed, 15 May 2013 20:37:27 +0000 (13:37 -0700)]

am 76582a06: am 0e0644ad: am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce

* commit '76582a062e3c9333f55c5d43c5900637feeb0492':
Fix another annoying warning log spam

commit | commitdiff | tree

Michael Kolb [Wed, 15 May 2013 20:35:17 +0000 (13:35 -0700)]

am f8d78d2f: am c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce

* commit 'f8d78d2fda5b706e5932f8d428f6316f4e68a32a':
Grey out undo/redo/reset according to state

commit | commitdiff | tree

Michael Kolb [Wed, 15 May 2013 20:35:16 +0000 (13:35 -0700)]

am da046959: am 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-bryce

* commit 'da046959e0b990e532e774779c50b2b5c1d7a785':
Correct label position after rotation

commit | commitdiff | tree

ztenghui [Wed, 15 May 2013 20:34:58 +0000 (13:34 -0700)]

am 0e0644ad: am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce

* commit '0e0644ad8538253bfb0e07bdafaa2dacba6c6a56':
Fix another annoying warning log spam

commit | commitdiff | tree

Michael Kolb [Wed, 15 May 2013 18:57:37 +0000 (11:57 -0700)]

am c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce

* commit 'c2f813a36711742af3b23743ef1849cec13a9a95':
Grey out undo/redo/reset according to state

commit | commitdiff | tree

Michael Kolb [Wed, 15 May 2013 18:57:36 +0000 (11:57 -0700)]

am 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-bryce

* commit '655e208d5dc1305d9e4eb5301dec0673136151c9':
Correct label position after rotation

commit | commitdiff | tree

Michael Kolb [Wed, 15 May 2013 18:55:19 +0000 (18:55 +0000)]

Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce

commit | commitdiff | tree

Michael Kolb [Wed, 15 May 2013 18:55:08 +0000 (18:55 +0000)]

Merge "Correct label position after rotation" into gb-ub-photos-bryce

commit | commitdiff | tree

ztenghui [Wed, 15 May 2013 17:37:57 +0000 (10:37 -0700)]

am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce

* commit '4aa8d5fc9d3478d511786cb99d5ba704d3e1f426':
Fix another annoying warning log spam

commit | commitdiff | tree

ztenghui [Wed, 15 May 2013 17:25:40 +0000 (17:25 +0000)]

Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce

commit | commitdiff | tree

Marco Nelissen [Wed, 15 May 2013 15:00:38 +0000 (08:00 -0700)]

am d41597fd: am 6e59979d: Merge "Enable virtualization" into jb-mr2-dev

* commit 'd41597fda5f25c4915cde35566f357903c56c37e':
Enable virtualization

commit | commitdiff | tree

Marco Nelissen [Wed, 15 May 2013 14:58:32 +0000 (07:58 -0700)]

am 6e59979d: Merge "Enable virtualization" into jb-mr2-dev

* commit '6e59979de90664d5e93d25a4bf2e165de2e20ac2':
Enable virtualization

commit | commitdiff | tree

Marco Nelissen [Wed, 15 May 2013 14:56:19 +0000 (14:56 +0000)]

Merge "Enable virtualization" into jb-mr2-dev

commit | commitdiff | tree

The Android Automerger [Wed, 15 May 2013 12:55:39 +0000 (05:55 -0700)]

merge in jb-mr2-release history after reset to jb-mr2-dev

commit | commitdiff | tree

Michael Kolb [Tue, 14 May 2013 22:43:28 +0000 (15:43 -0700)]

Grey out undo/redo/reset according to state

Bug: 8791729

Change-Id: I1252a9634870e56c8989688eeb28b1b4c2781827

commit | commitdiff | tree

Doris Liu [Tue, 14 May 2013 21:30:02 +0000 (14:30 -0700)]

am a4f1cdc2: am 18f19a72: am 26dbb20c: Merge "Pause face detection when review captured images" into gb-ub-photos-bryce

* commit 'a4f1cdc2b0a9601d878e7ea09a79ec28e0e543ca':
Pause face detection when review captured images

commit | commitdiff | tree

Michael Kolb [Tue, 14 May 2013 21:28:14 +0000 (14:28 -0700)]

Correct label position after rotation

Bug: 8963421

Change-Id: If361e0ca6f20612ec3baae74cde444bd26164ab3

commit | commitdiff | tree

Doris Liu [Tue, 14 May 2013 21:28:05 +0000 (14:28 -0700)]

am 18f19a72: am 26dbb20c: Merge "Pause face detection when review captured images" into gb-ub-photos-bryce

* commit '18f19a722c327edcf8f84fc5494f13cbbe816a4d':
Pause face detection when review captured images

commit | commitdiff | tree

Doris Liu [Tue, 14 May 2013 21:26:46 +0000 (14:26 -0700)]

am 26dbb20c: Merge "Pause face detection when review captured images" into gb-ub-photos-bryce

* commit '26dbb20c15e27d22a14efd0a25ec4e50cf5084cc':
Pause face detection when review captured images

commit | commitdiff | tree

Doris Liu [Tue, 14 May 2013 21:25:22 +0000 (21:25 +0000)]

Merge "Pause face detection when review captured images" into gb-ub-photos-bryce

commit | commitdiff | tree

Tim Murray [Tue, 14 May 2013 19:49:24 +0000 (12:49 -0700)]

am 2c28721b: am a24c4906: am 33f2a880: Only link librsjni in unbundled branches.

* commit '2c28721bcfe6135f7477fa84e214d7616a6a6fc7':
Only link librsjni in unbundled branches.

commit | commitdiff | tree

Tim Murray [Tue, 14 May 2013 19:46:10 +0000 (12:46 -0700)]

am a24c4906: am 33f2a880: Only link librsjni in unbundled branches.

* commit 'a24c4906455e02f1a8cc8db98dd2280a1d19eca4':
Only link librsjni in unbundled branches.

commit | commitdiff | tree

Tim Murray [Tue, 14 May 2013 19:44:55 +0000 (12:44 -0700)]

am 33f2a880: Only link librsjni in unbundled branches.

* commit '33f2a8800ff5228bf81a0fdc75c1289bae9a4d1c':
Only link librsjni in unbundled branches.

commit | commitdiff | tree

Doris Liu [Tue, 14 May 2013 18:31:19 +0000 (11:31 -0700)]

Pause face detection when review captured images

Bug: 8799508
Change-Id: I994299a3ad406bcee5e6699265cb0ab29612e62c

commit | commitdiff | tree

The Android Automerger [Tue, 14 May 2013 12:55:38 +0000 (05:55 -0700)]

merge in jb-mr2-release history after reset to jb-mr2-dev

commit | commitdiff | tree

Tim Murray [Mon, 13 May 2013 22:47:58 +0000 (15:47 -0700)]

Only link librsjni in unbundled branches.

bug 8939828

Change-Id: I87d28185c6fb2b23852eb66487bf99d6111c3a7a

commit | commitdiff | tree

Marco Nelissen [Mon, 13 May 2013 20:36:01 +0000 (13:36 -0700)]

Enable virtualization

When the Intent says to virtualize, and the right virtualizer is
present on the device, enable virtualization.
b/8767565

Change-Id: I8a98404b21c434966b7ae2dc341eb38f2a47eef2

commit | commitdiff | tree

Doris Liu [Mon, 13 May 2013 18:41:36 +0000 (11:41 -0700)]

am ed9b3ac3: am c5fb797d: am 25d69c11: Merge "New count down beeps." into gb-ub-photos-bryce

* commit 'ed9b3ac3b0064e9b4acf41d4c083d325abeefe8b':
New count down beeps.

commit | commitdiff | tree

Doris Liu [Mon, 13 May 2013 18:38:16 +0000 (11:38 -0700)]

am c5fb797d: am 25d69c11: Merge "New count down beeps." into gb-ub-photos-bryce

* commit 'c5fb797d41515e15fba40042bc947543b5e9896c':
New count down beeps.

commit | commitdiff | tree

Doris Liu [Mon, 13 May 2013 18:34:47 +0000 (11:34 -0700)]

am 25d69c11: Merge "New count down beeps." into gb-ub-photos-bryce

* commit '25d69c11831fabf8f4e474aaf17b05dd001979ce':
New count down beeps.

commit | commitdiff | tree

Doris Liu [Mon, 13 May 2013 18:32:20 +0000 (18:32 +0000)]

Merge "New count down beeps." into gb-ub-photos-bryce

commit | commitdiff | tree

ztenghui [Sat, 11 May 2013 00:44:23 +0000 (17:44 -0700)]

Fix another annoying warning log spam

bug:8771541

When we set up the icon rendering, we need to set the geometry, too.

Change-Id: I331bdb752c5183d5e2611d8387505055c4219b92

commit | commitdiff | tree

Doris Liu [Mon, 13 May 2013 17:48:54 +0000 (10:48 -0700)]

New count down beeps.

Bug: 8872947
Change-Id: Ifc84daabba0a4e85e32fd3547303716ca5ed649a

commit | commitdiff | tree

The Android Automerger [Mon, 13 May 2013 12:55:53 +0000 (05:55 -0700)]

merge in jb-mr2-release history after reset to jb-mr2-dev

commit | commitdiff | tree

George Mount [Fri, 10 May 2013 10:06:47 +0000 (03:06 -0700)]

am 8cbdeb31: am 09e1a5ac: am ac94740c: Remove GL dependency on unused stencil buffers.

* commit '8cbdeb310a769b02c61f2ec0a231821bc6ee5fa2':
Remove GL dependency on unused stencil buffers.

commit | commitdiff | tree

George Mount [Fri, 10 May 2013 06:40:45 +0000 (23:40 -0700)]

am 09e1a5ac: am ac94740c: Remove GL dependency on unused stencil buffers.

* commit '09e1a5ac2cdd9bccd543df91859152a0aa3c3879':
Remove GL dependency on unused stencil buffers.

commit | commitdiff | tree

George Mount [Fri, 10 May 2013 01:04:58 +0000 (18:04 -0700)]

am ac94740c: Remove GL dependency on unused stencil buffers.

* commit 'ac94740cd673a016542d803c8600633c99b7427e':
Remove GL dependency on unused stencil buffers.

commit | commitdiff | tree

George Mount [Thu, 9 May 2013 20:30:39 +0000 (13:30 -0700)]

Remove GL dependency on unused stencil buffers.

Bug 8884435

Change-Id: I8e7f0563a4a901953e3e2b14e35457b4fefe2e34

commit | commitdiff | tree

ztenghui [Thu, 9 May 2013 16:24:17 +0000 (09:24 -0700)]

am d49fd01c: am f4733e6f: am 9a4fb2dc: Merge "Fix the verbose log" into gb-ub-photos-bryce

* commit 'd49fd01c2547c4630c1d3665e70523698ea7f48b':
Fix the verbose log

commit | commitdiff | tree

ztenghui [Thu, 9 May 2013 16:22:08 +0000 (09:22 -0700)]

am f4733e6f: am 9a4fb2dc: Merge "Fix the verbose log" into gb-ub-photos-bryce

* commit 'f4733e6f0f8c7012a448f375627478bfb9e53c96':
Fix the verbose log

commit | commitdiff | tree

ztenghui [Thu, 9 May 2013 16:19:40 +0000 (09:19 -0700)]

am 9a4fb2dc: Merge "Fix the verbose log" into gb-ub-photos-bryce

* commit '9a4fb2dc95722c45e2acb4f4fe380d27830f8d8b':
Fix the verbose log

commit | commitdiff | tree

ztenghui [Thu, 9 May 2013 16:18:09 +0000 (16:18 +0000)]

Merge "Fix the verbose log" into gb-ub-photos-bryce

commit | commitdiff | tree

The Android Automerger [Thu, 9 May 2013 12:55:35 +0000 (05:55 -0700)]

merge in jb-mr2-release history after reset to jb-mr2-dev

commit | commitdiff | tree

Bart Sears [Thu, 9 May 2013 06:16:01 +0000 (23:16 -0700)]

am 2ee5df0c: am de8d7096: am b298ab63: Merge "Close menu in onPause" into gb-ub-photos-bryce

* commit '2ee5df0cd4fec393b22c719620fd158e6b1eccb7':
Close menu in onPause

commit | commitdiff | tree

Bart Sears [Thu, 9 May 2013 06:14:57 +0000 (23:14 -0700)]

am de8d7096: am b298ab63: Merge "Close menu in onPause" into gb-ub-photos-bryce

* commit 'de8d70965ebea26929aae9f40245e5147d638f65':
Close menu in onPause

commit | commitdiff | tree

Bart Sears [Thu, 9 May 2013 06:13:47 +0000 (23:13 -0700)]

am b298ab63: Merge "Close menu in onPause" into gb-ub-photos-bryce

* commit 'b298ab636fec3894b9e702eaa0a6028ba03f49b1':
Close menu in onPause

commit | commitdiff | tree

Bart Sears [Thu, 9 May 2013 06:12:06 +0000 (06:12 +0000)]

Merge "Close menu in onPause" into gb-ub-photos-bryce

commit | commitdiff | tree

Michael Kolb [Thu, 9 May 2013 00:07:48 +0000 (17:07 -0700)]

am 71d392b5: am c3ec037f: am e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce

* commit '71d392b57e947a6876cf4e877acd95d06421244f':
Add drop shadow to preview thumb

commit | commitdiff | tree

Michael Kolb [Thu, 9 May 2013 00:02:15 +0000 (17:02 -0700)]

am c3ec037f: am e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce

* commit 'c3ec037ffa27fb45e1bbf8ba9d08da22a6979920':
Add drop shadow to preview thumb

commit | commitdiff | tree

Michael Kolb [Thu, 9 May 2013 00:00:00 +0000 (17:00 -0700)]

am e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce

* commit 'e324a388ead1f291fe27eb6b4ce5f25b55a29a49':
Add drop shadow to preview thumb

commit | commitdiff | tree

Michael Kolb [Wed, 8 May 2013 23:58:45 +0000 (23:58 +0000)]

Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce

commit | commitdiff | tree

ztenghui [Wed, 8 May 2013 21:43:15 +0000 (14:43 -0700)]

Fix the verbose log

Now use adb shell log.tag.BasicRepresentation VERBOSE to turn on the logging.

bug:8771541

Change-Id: Ib9e1e44dbbd4e46798226d8ab5dc7365e8a90e27

commit | commitdiff | tree

Michael Kolb [Wed, 8 May 2013 00:24:23 +0000 (17:24 -0700)]

Add drop shadow to preview thumb

Bug: 8826241

Also, remove animateSlide blocker, it caused frozen review

Change-Id: Ic8eb129ec236726550a26bc387967fe0c00473e9

commit | commitdiff | tree

Michael Kolb [Wed, 8 May 2013 23:05:04 +0000 (16:05 -0700)]

Close menu in onPause

Bug: 8722672

Change-Id: Ia3fac3ccc5db6cc1bb2a1dd32960ec6295735cfc

commit | commitdiff | tree

Sascha Haeberling [Wed, 8 May 2013 22:19:49 +0000 (15:19 -0700)]

am d829a6c5: am b51819ba: am 58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce

* commit 'd829a6c52cdcf87001e8d4189a1eb80905083abc':
Reduce max size of bitmap returned by crop dialog.

commit | commitdiff | tree

Sascha Haeberling [Wed, 8 May 2013 22:17:52 +0000 (15:17 -0700)]

am b51819ba: am 58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce

* commit 'b51819ba4e1690aa43ba112be707220414e44f3b':
Reduce max size of bitmap returned by crop dialog.

commit | commitdiff | tree

Sascha Haeberling [Wed, 8 May 2013 22:15:30 +0000 (15:15 -0700)]

am 58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce

* commit '58f32428768ff67520e0363de7a8c1929a4eac1f':
Reduce max size of bitmap returned by crop dialog.

commit | commitdiff | tree

Sascha Haeberling [Wed, 8 May 2013 22:13:44 +0000 (22:13 +0000)]

Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce

commit | commitdiff | tree

Michael Kolb [Wed, 8 May 2013 22:05:32 +0000 (15:05 -0700)]

am e51dd93e: am 17b4b977: am c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce

* commit 'e51dd93ed757c7b89467cd69932efd66b702f7f3':
Fix second level menu

commit | commitdiff | tree

Angus Kong [Wed, 8 May 2013 22:05:09 +0000 (15:05 -0700)]

am aec98df1: am 50e22843: Merge "Further assets clean up." into jb-mr2-dev

* commit 'aec98df1f61d5a67e226ef7bea62ba411653c877':
Further assets clean up.

commit | commitdiff | tree

Angus Kong [Wed, 8 May 2013 22:04:36 +0000 (15:04 -0700)]

am d03380c0: (-s ours) am fafd8bbc: am 188ad6ed: (-s ours) Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce

* commit 'd03380c0d08219e213d0ec7162b7e124ba9616c8':
DO NOT MERGE Further assets clean up.

commit | commitdiff | tree

Bobby Georgescu [Wed, 8 May 2013 22:04:36 +0000 (15:04 -0700)]

am bbbedf36: am b45e0eab: am 9fcabfb5: Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce

* commit 'bbbedf366aed5cdb230e30b93c77a272a6d70db7':
Fix memory leak in SparseArrayBitmapPool

commit | commitdiff | tree

Doris Liu [Wed, 8 May 2013 22:03:47 +0000 (15:03 -0700)]

am 01fd3f2e: am ca83651a: am b281a646: Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce

* commit '01fd3f2eb5a6b2239fee7b53bbbaa508dddcb3da':
Fix video capture intent overlapping buttons

commit | commitdiff | tree

Michael Kolb [Wed, 8 May 2013 22:03:46 +0000 (15:03 -0700)]

am b046fa1e: am dcd90240: am 0a830ce4: Merge "Add animation to slice selection" into gb-ub-photos-bryce

* commit 'b046fa1e21e056da33d26a7f7e1fd8dcf3038db3':
Add animation to slice selection

commit | commitdiff | tree

Michael Kolb [Wed, 8 May 2013 22:03:45 +0000 (15:03 -0700)]

am e52429d3: am 7174d685: am 9a26f823: Merge "Remove unused assets" into gb-ub-photos-bryce

* commit 'e52429d3d1937c5dd53a88fe3201223ef636af11':
Remove unused assets

commit | commitdiff | tree

Sascha Haeberling [Wed, 8 May 2013 22:03:19 +0000 (15:03 -0700)]

am bc2cab3d: am a8e0de46: am 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce

* commit 'bc2cab3df0341e112c9a9363b7e327cff56a1622':
Avoid rounding errors from cropping uncropped images.

commit | commitdiff | tree

Michael Kolb [Wed, 8 May 2013 22:03:05 +0000 (15:03 -0700)]

am db65cad4: am d7ec31f0: am 48ce39b8: Fix review button placement

* commit 'db65cad47986206877a5be663f314417504544f5':
Fix review button placement

commit | commitdiff | tree

Michael Kolb [Wed, 8 May 2013 21:36:59 +0000 (14:36 -0700)]

am 17b4b977: am c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce

* commit '17b4b977fad36b1b943cafef043e02c707844c97':
Fix second level menu

commit | commitdiff | tree

Michael Kolb [Wed, 8 May 2013 21:32:20 +0000 (14:32 -0700)]

am c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce

* commit 'c3fde4b4032591fc34ce118860e53fe92c0b3706':
Fix second level menu