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

Ruben Brunk [Thu, 18 Apr 2013 02:59:22 +0000 (19:59 -0700)]

am 04440b3c: am 5ed8e518: am 61f3f111: Remove call to superclass onTouch in curves.

* commit '04440b3c55e11d798510484e7b7eccb04f0b8a1e':
Remove call to superclass onTouch in curves.

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Apr 2013 02:54:15 +0000 (19:54 -0700)]

am 5ed8e518: am 61f3f111: Remove call to superclass onTouch in curves.

* commit '5ed8e518b4208e3d748aa421778a885a95f17756':
Remove call to superclass onTouch in curves.

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Apr 2013 02:51:45 +0000 (19:51 -0700)]

am 61f3f111: Remove call to superclass onTouch in curves.

* commit '61f3f1113a5b4f8583fd9fcae4d24734617cae21':
Remove call to superclass onTouch in curves.

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Apr 2013 01:55:53 +0000 (18:55 -0700)]

Remove call to superclass onTouch in curves.

Bug: 8523301
Change-Id: I0102a228c2d1b3199412c9897a9f1abdb4bcb41f

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Apr 2013 01:59:04 +0000 (18:59 -0700)]

am b343fc4a: am 550a4871: am 869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce

* commit 'b343fc4ab76d38830e86cfd5b923dbfcc50339a9':
Remove redeye filter.

commit | commitdiff | tree

Sascha Haeberling [Thu, 18 Apr 2013 01:59:04 +0000 (18:59 -0700)]

am 9aefbe13: am 5aa6cb20: am 49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce

* commit '9aefbe13d8dfb74ca011ca5fca9823b2dcd7ac73':
Add method for returning SoundPool audio type.

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Apr 2013 01:56:12 +0000 (18:56 -0700)]

am 550a4871: am 869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce

* commit '550a4871904503748660f0d4fc524e83a5756707':
Remove redeye filter.

commit | commitdiff | tree

Sascha Haeberling [Thu, 18 Apr 2013 01:56:11 +0000 (18:56 -0700)]

am 5aa6cb20: am 49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce

* commit '5aa6cb20f0971c633982711666f5be7a61cc37d6':
Add method for returning SoundPool audio type.

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Apr 2013 01:52:20 +0000 (18:52 -0700)]

am 869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce

* commit '869cb0484c1c9e77d089abe198817709d3e89eb9':
Remove redeye filter.

commit | commitdiff | tree

Sascha Haeberling [Thu, 18 Apr 2013 01:52:19 +0000 (18:52 -0700)]

am 49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce

* commit '49ee213fbb0f3434002693889bdae3e7c0d5b378':
Add method for returning SoundPool audio type.

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Apr 2013 01:49:53 +0000 (01:49 +0000)]

Merge "Remove redeye filter." into gb-ub-photos-bryce

commit | commitdiff | tree

Sascha Haeberling [Thu, 18 Apr 2013 01:48:34 +0000 (01:48 +0000)]

Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Apr 2013 01:39:27 +0000 (18:39 -0700)]

Remove redeye filter.

Bug: 8609003
Change-Id: I7f10e928fa775e5186146f06877dda34b3df699a

commit | commitdiff | tree

John Hoford [Thu, 18 Apr 2013 00:48:56 +0000 (17:48 -0700)]

am 0ee15ec9: am dd42cac8: am 12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce

* commit '0ee15ec9f463f8b6c8e8294e4e4fc5d99bb707dd':
improve pinch to zoom behavior

commit | commitdiff | tree

John Hoford [Thu, 18 Apr 2013 00:45:01 +0000 (17:45 -0700)]

am dd42cac8: am 12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce

* commit 'dd42cac8336dd6651968fe87e63bac4d84a81b21':
improve pinch to zoom behavior

commit | commitdiff | tree

John Hoford [Thu, 18 Apr 2013 00:39:47 +0000 (17:39 -0700)]

am 12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce

* commit '12cd022273f14a64d9cdf79aa6a27feb099b9107':
improve pinch to zoom behavior

commit | commitdiff | tree

John Hoford [Thu, 18 Apr 2013 00:36:52 +0000 (00:36 +0000)]

Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce

commit | commitdiff | tree

Michael Kolb [Thu, 18 Apr 2013 00:17:53 +0000 (17:17 -0700)]

am 4bcc3286: am 133f92d4: am 1c7d2bc2: First part of asset drop

* commit '4bcc3286df4879744ce073e71691674b4d413697':
First part of asset drop

commit | commitdiff | tree

Michael Kolb [Thu, 18 Apr 2013 00:14:05 +0000 (17:14 -0700)]

am 133f92d4: am 1c7d2bc2: First part of asset drop

* commit '133f92d47e420aa9c6455122fa67daa22a3910e8':
First part of asset drop

commit | commitdiff | tree

Michael Kolb [Thu, 18 Apr 2013 00:08:37 +0000 (17:08 -0700)]

am 1c7d2bc2: First part of asset drop

* commit '1c7d2bc293a1ff824db768756d0309dfbc7f08d8':
First part of asset drop

commit | commitdiff | tree

Michael Kolb [Wed, 17 Apr 2013 23:01:32 +0000 (16:01 -0700)]

First part of asset drop

Bug: 8640131

Added new assets, updated front/back menu entry.

Change-Id: I9b007cde14eeb9f44706d99ea485e03ce1de9d53

commit | commitdiff | tree

John Hoford [Wed, 17 Apr 2013 20:35:03 +0000 (13:35 -0700)]

improve pinch to zoom behavior

bug:8630925
Change-Id: Ica4c4ab83e726901a8e729056529aa8379cb52ae

commit | commitdiff | tree

Sascha Haeberling [Wed, 17 Apr 2013 21:55:44 +0000 (14:55 -0700)]

Add method for returning SoundPool audio type.

Bug: 7402245

Change-Id: Ib45ef78265a66d59f0b27473d9dfcdfa4624c8fa

commit | commitdiff | tree

ztenghui [Wed, 17 Apr 2013 18:30:51 +0000 (11:30 -0700)]

am 6e6a0c2d: am f4f9e425: am 75408cd3: Add accessibility to video player controller.

* commit '6e6a0c2d3bb78b399fe265e3432a952e3ee9c030':
Add accessibility to video player controller.

commit | commitdiff | tree

ztenghui [Wed, 17 Apr 2013 18:26:06 +0000 (11:26 -0700)]

am f4f9e425: am 75408cd3: Add accessibility to video player controller.

* commit 'f4f9e425d631c863503f509180015e1d7eca820b':
Add accessibility to video player controller.

commit | commitdiff | tree

ztenghui [Wed, 17 Apr 2013 18:24:36 +0000 (11:24 -0700)]

am 75408cd3: Add accessibility to video player controller.

* commit '75408cd38e7efe0755addcf3170932c8b3190bc1':
Add accessibility to video player controller.

commit | commitdiff | tree

ztenghui [Tue, 16 Apr 2013 20:52:07 +0000 (13:52 -0700)]

Add accessibility to video player controller.

bug:5714277

cherry pick the Carlsbad CL:
https://googleplex-android-review.git.corp.google.com/#/c/297944/

Change-Id: If0de1ec250a211890e1914d89e8b61780542a675

commit | commitdiff | tree

nicolasroard [Wed, 17 Apr 2013 00:55:35 +0000 (17:55 -0700)]

am 071544b6: am 19191a4f: am 83bd8d34: Remove History panel

* commit '071544b6003966b4154e78ce5a91ca1267031406':
Remove History panel

commit | commitdiff | tree

nicolasroard [Wed, 17 Apr 2013 00:51:24 +0000 (17:51 -0700)]

am 19191a4f: am 83bd8d34: Remove History panel

* commit '19191a4f58f4d80529b3400d1bd653faeacfbc2a':
Remove History panel

commit | commitdiff | tree

nicolasroard [Wed, 17 Apr 2013 00:46:10 +0000 (17:46 -0700)]

am 83bd8d34: Remove History panel

* commit '83bd8d346d295e4fe06212da957feb77ee23c04d':
Remove History panel

commit | commitdiff | tree

nicolasroard [Wed, 17 Apr 2013 00:09:20 +0000 (17:09 -0700)]

Remove History panel

Now that we have the state, history
is not that useful. For clarity's sake
we are removing it.

bug:8620913
bug:8503386
bug:8324322
bug:8324023
Change-Id: Ife86f3ab67c05d5781234496c7518866b506631b

commit | commitdiff | tree

Ruben Brunk [Wed, 17 Apr 2013 00:06:45 +0000 (17:06 -0700)]

am c10b3066: am 965a99b8: am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce

* commit 'c10b3066e063e14cc9bf9cbecf6f8098f955340b':
Shows final set of filters in UI.

commit | commitdiff | tree

Ruben Brunk [Wed, 17 Apr 2013 00:04:41 +0000 (17:04 -0700)]

am 965a99b8: am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce

* commit '965a99b87b38bc1a846c7dfb4349d399f9e1bc1e':
Shows final set of filters in UI.

commit | commitdiff | tree

Ruben Brunk [Wed, 17 Apr 2013 00:02:38 +0000 (17:02 -0700)]

am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce

* commit '113e0fbd251966629719f390e43b320b84751304':
Shows final set of filters in UI.

commit | commitdiff | tree

Ruben Brunk [Tue, 16 Apr 2013 23:59:56 +0000 (23:59 +0000)]

Merge "Shows final set of filters in UI." into gb-ub-photos-bryce

commit | commitdiff | tree

Ruben Brunk [Tue, 16 Apr 2013 23:25:31 +0000 (16:25 -0700)]

Shows final set of filters in UI.

Bug: 8609003
Change-Id: Id7530da3e11fb88a964b881ba8f8fad70b40bc23

commit | commitdiff | tree

Doris Liu [Tue, 16 Apr 2013 23:20:18 +0000 (16:20 -0700)]

am c44633a0: am 6aa5d2df: am 953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce

* commit 'c44633a0e53ad406bc2629196b69bec325581b66':
Fix face unlock failure

commit | commitdiff | tree

nicolasroard [Tue, 16 Apr 2013 23:20:17 +0000 (16:20 -0700)]

am 92a587f9: am ccc18a73: am 03332473: Make convertBitmap() protected so that Frames can use it.

* commit '92a587f98ab0e7f40ce1c6ba5b164057dad7363c':
Make convertBitmap() protected so that Frames can use it.

commit | commitdiff | tree

Doris Liu [Tue, 16 Apr 2013 23:16:26 +0000 (16:16 -0700)]

am 6aa5d2df: am 953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce

* commit '6aa5d2dfbf4890a027512d114759864fc4207025':
Fix face unlock failure

commit | commitdiff | tree

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.

commit | commitdiff | tree

Doris Liu [Tue, 16 Apr 2013 23:14:25 +0000 (16:14 -0700)]

am 953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce

* commit '953f109b688477b086281fe09074d3886ef87fba':
Fix face unlock failure

commit | commitdiff | tree

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.

commit | commitdiff | tree

Doris Liu [Tue, 16 Apr 2013 23:12:49 +0000 (23:12 +0000)]

Merge "Fix face unlock failure" into gb-ub-photos-bryce

commit | commitdiff | tree

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

commit | commitdiff | tree

Doris Liu [Tue, 16 Apr 2013 22:54:42 +0000 (15:54 -0700)]

Fix face unlock failure

Bug: 7494156
Change-Id: I6c909e498305ff3e66efdeeb9fb5581ea8f51715

commit | commitdiff | tree

nicolasroard [Tue, 16 Apr 2013 22:50:14 +0000 (15:50 -0700)]

am c6a1e41f: am d80c69a8: am f3f0aae4: Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce

* commit 'c6a1e41fb7272a5227a4c73652c1226df8afd928':
Remove the Simple Edit menu item in Gallery

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Angus Kong [Tue, 16 Apr 2013 21:58:55 +0000 (14:58 -0700)]

am fcabacf4: am 65f3514a: am bc02d7dc: Don\'t wait for Mosaic Renderer ready in UI thread.

* commit 'fcabacf449cbca3bd219d5eb4031d6ac5a779caf':
Don't wait for Mosaic Renderer ready in UI thread.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

nicolasroard [Tue, 16 Apr 2013 20:31:03 +0000 (13:31 -0700)]

am b6d61d16: am 9472ae6f: am fb6a8e16: New state panel

* commit 'b6d61d1601d9cddfba22672b45ac4c3ad7758e2d':
New state panel

commit | commitdiff | tree

nicolasroard [Tue, 16 Apr 2013 20:27:11 +0000 (13:27 -0700)]

am 9472ae6f: am fb6a8e16: New state panel

* commit '9472ae6f9bbe0a0a6b86c827585ea429e07f0220':
New state panel

commit | commitdiff | tree

nicolasroard [Tue, 16 Apr 2013 20:23:19 +0000 (13:23 -0700)]

am fb6a8e16: New state panel

* commit 'fb6a8e166f0a46d2a994a408b1679e3a67fdcb52':
New state panel

commit | commitdiff | tree

nicolasroard [Mon, 15 Apr 2013 21:41:00 +0000 (14:41 -0700)]

New state panel

bug:8620913
bug:8503386

Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06

commit | commitdiff | tree

Michael Kolb [Tue, 16 Apr 2013 04:55:03 +0000 (21:55 -0700)]

am 53bd5f2c: am 44d3d602: am 0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryce

* commit '53bd5f2c166cf70a3380acd3aa3dd2d21a0d515d':
Angle menu at edge of screen

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Angus Kong [Mon, 15 Apr 2013 22:41:46 +0000 (15:41 -0700)]

am 595c2ae1: am 03152021: am f7771f98: Use extra copy of parameters for concurrent access

* commit '595c2ae1cde680fb37fd8fdd1610722813ea160f':
Use extra copy of parameters for concurrent access

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Michael Kolb [Mon, 15 Apr 2013 20:36:50 +0000 (13:36 -0700)]

am 81d1589e: am baf6d4de: am 78991864: Merge "Also, add labels to video menu" into gb-ub-photos-bryce

* commit '81d1589e8fcce10cd68b2a0dd438f59a7fe0fc70':
Also, add labels to video menu

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Michael Kolb [Mon, 15 Apr 2013 20:17:27 +0000 (13:17 -0700)]

Also, add labels to video menu

Bug: 8618169

Change-Id: Ia933db79eccf2564c785a12c8c6551fa8eb1007c

commit | commitdiff | tree

Baligh Uddin [Mon, 15 Apr 2013 20:08:36 +0000 (13:08 -0700)]

am 4c58da80: am 9219a1f4: am a8de1aa5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '4c58da807dd7018f19274ae64b212c76b5eadb02':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 15 Apr 2013 20:04:49 +0000 (13:04 -0700)]

am 627d601c: am 09c275b2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '627d601cf6b7d17c1e7624a55dad3413a91f1753':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Mon, 15 Apr 2013 19:57:56 +0000 (19:57 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Mon, 15 Apr 2013 19:57:45 +0000 (19:57 +0000)]

Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

commit | commitdiff | tree

Baligh Uddin [Mon, 15 Apr 2013 19:57:35 +0000 (19:57 +0000)]

Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

commit | commitdiff | tree

Michael Kolb [Mon, 15 Apr 2013 19:51:02 +0000 (12:51 -0700)]

am 38ee8965: am 272566d7: am ad30f960: Merge "Add menu labels" into gb-ub-photos-bryce

* commit '38ee8965a1fcdc572e00ef131fcaec49153044fb':
Add menu labels

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Michael Kolb [Mon, 15 Apr 2013 19:40:32 +0000 (19:40 +0000)]

Merge "Add menu labels" into gb-ub-photos-bryce

commit | commitdiff | tree

Bobby Georgescu [Mon, 15 Apr 2013 19:39:41 +0000 (12:39 -0700)]

am ec909ce6: am 814c5c52: am 3dc6a630: Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce

* commit 'ec909ce64ff71cf165ea6934ec5342bb93f118f1':
Fix performance and other issues related to multi-selection

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

John Hoford [Mon, 15 Apr 2013 18:52:07 +0000 (11:52 -0700)]

am 63ae852c: am 1c8e45bf: am d2f5fe60: support for simplified parameters in filter

* commit '63ae852c8f91fd53cf57cd50023382f17146d509':
support for simplified parameters in filter

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Michael Kolb [Wed, 10 Apr 2013 15:50:51 +0000 (08:50 -0700)]

Add menu labels

Bug: 8618169

Change-Id: Iea1ac7256450afd2870c144099459f32868c699f

commit | commitdiff | tree

John Hoford [Wed, 10 Apr 2013 21:58:05 +0000 (14:58 -0700)]

support for simplified parameters in filter

Change-Id: I623e6fb90e8175c7e5e2dfc146f927eecba29817

commit | commitdiff | tree

Baligh Uddin [Mon, 15 Apr 2013 18:37:05 +0000 (11:37 -0700)]

Import translations. DO NOT MERGE

Change-Id: I8aeeb4b7b789a837367ca6ccb4b415053b094c74
Auto-generated-cl: translation import

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Open Source Project [Mon, 15 Apr 2013 17:53:14 +0000 (10:53 -0700)]

am 1e606658: Reconcile with jb-mr2-release - do not merge

* commit '1e60665812eea64ac9094882908147cd0dc5d110':
am bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

nicolasroard [Sat, 13 Apr 2013 15:17:58 +0000 (08:17 -0700)]

am a827ce9d: am cba8574c: am 4b6ea5bc: Add direct rendering for border

* commit 'a827ce9d82c533f65d9e34691a593c6ebdd97ef3':
Add direct rendering for border