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

Mangesh Ghiware [Mon, 11 Mar 2013 22:52:19 +0000 (15:52 -0700)]

am dc32aaf9: Enable operations on accounts table.

* commit 'dc32aaf95fd6925796474688c24704b3265a1ae7':
Enable operations on accounts table.

commit | commitdiff | tree

Mangesh Ghiware [Mon, 11 Mar 2013 22:44:56 +0000 (15:44 -0700)]

Enable operations on accounts table.

Change-Id: Ida0e379cad422dbeffb3b4ea89232db7f45a36e4

commit | commitdiff | tree

Michael Kolb [Mon, 11 Mar 2013 22:36:03 +0000 (15:36 -0700)]

am 54c1256f: Merge "Spring cleaning" into gb-ub-photos-bryce

* commit '54c1256ffd0f578f4b33680c54d50ab6901d9098':
Spring cleaning

commit | commitdiff | tree

John Hoford [Mon, 11 Mar 2013 22:36:02 +0000 (15:36 -0700)]

am 6f3ff5b4: split filter show into multiple files

* commit '6f3ff5b486e30221361afd066510a7374962fd09':
split filter show into multiple files

commit | commitdiff | tree

Michael Kolb [Mon, 11 Mar 2013 22:35:00 +0000 (22:35 +0000)]

Merge "Spring cleaning" into gb-ub-photos-bryce

commit | commitdiff | tree

John Hoford [Mon, 11 Mar 2013 22:08:26 +0000 (15:08 -0700)]

split filter show into multiple files

Change-Id: I3d6b61ed893befa24a8c8306981d74096db91535

commit | commitdiff | tree

Michael Kolb [Sat, 9 Mar 2013 04:43:01 +0000 (20:43 -0800)]

Spring cleaning

Change-Id: I00d7176301501784a6a400bc9ea2cb23ff9ec90a

commit | commitdiff | tree

John Hoford [Mon, 11 Mar 2013 21:39:33 +0000 (14:39 -0700)]

am 6a07dfbe: refactoring to make Editor classes do more

* commit '6a07dfbe03c8396cc43840a1630ea480a2cff663':
refactoring to make Editor classes do more

commit | commitdiff | tree

John Hoford [Mon, 11 Mar 2013 18:10:22 +0000 (11:10 -0700)]

refactoring to make Editor classes do more

Change-Id: Id0885929cf3a9410bd0e5d3bf96eb99e8c7e1cf9

commit | commitdiff | tree

Jean-Baptiste Queru [Mon, 11 Mar 2013 20:07:32 +0000 (13:07 -0700)]

am 009b0502: am 63e1a5a9: am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '009b05028ced67523e257a2abbdc5c07776f0ceb':

commit | commitdiff | tree

Jean-Baptiste Queru [Mon, 11 Mar 2013 20:00:46 +0000 (13:00 -0700)]

am 63e1a5a9: am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '63e1a5a9076f90e9e704e06956ba414a1d28c6a3':

commit | commitdiff | tree

Michael Kolb [Mon, 11 Mar 2013 20:00:00 +0000 (13:00 -0700)]

am de175c80: Don\'t record video before preview is started

* commit 'de175c806c524e08b4ca7c6ec991a5610c3856d9':
Don't record video before preview is started

commit | commitdiff | tree

Jean-Baptiste Queru [Mon, 11 Mar 2013 19:56:10 +0000 (12:56 -0700)]

am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4c13ac4382d3bde4eb8b3c448a8ee6cb05a541d0':

commit | commitdiff | tree

Michael Kolb [Mon, 11 Mar 2013 19:37:40 +0000 (12:37 -0700)]

Don't record video before preview is started

Bug: 8358998

Change-Id: I5d2380020b3e999f904b8a715324db13b25ebb5a

commit | commitdiff | tree

Jean-Baptiste Queru [Mon, 11 Mar 2013 19:41:55 +0000 (12:41 -0700)]

am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '73d8e5d2652b7fd50361d4fc4542140c62591404':

commit | commitdiff | tree

Jean-Baptiste Queru [Mon, 11 Mar 2013 19:27:37 +0000 (12:27 -0700)]

am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '63da0db6333796d7b3a94af55de58039cea94b8d':

commit | commitdiff | tree

Jean-Baptiste Queru [Mon, 11 Mar 2013 19:21:38 +0000 (12:21 -0700)]

Reconcile with jb-mr1-release - do not merge

commit | commitdiff | tree

Ruben Brunk [Mon, 11 Mar 2013 19:14:41 +0000 (12:14 -0700)]

am f07bb274: Clear Gallery\'s bitmap pool before starting photoeditor.

* commit 'f07bb27436a65b233c1caf4aa06c6257a9cf4046':
Clear Gallery's bitmap pool before starting photoeditor.

commit | commitdiff | tree

Ruben Brunk [Mon, 11 Mar 2013 19:00:06 +0000 (12:00 -0700)]

Clear Gallery's bitmap pool before starting photoeditor.

Change-Id: Iaa1f559db12ba22e53673b2e9fe2c3fbabf33514

commit | commitdiff | tree

Ruben Brunk [Mon, 11 Mar 2013 18:45:08 +0000 (11:45 -0700)]

am 5a17cc93: Merge "Revert "Clear Gallery\'s bitmap pool on photo editor start. Minor refactoring."" into gb-ub-photos-bryce

* commit '5a17cc93c3a34f0494eaa38353c0ac727086222d':
Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."

commit | commitdiff | tree

Ruben Brunk [Mon, 11 Mar 2013 18:42:41 +0000 (18:42 +0000)]

Merge "Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."" into gb-ub-photos-bryce

commit | commitdiff | tree

Ruben Brunk [Mon, 11 Mar 2013 18:41:39 +0000 (18:41 +0000)]

Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."

This reverts commit 65948b17607d6fab9a2561749a90e16889fd1eea

Change-Id: Iea682767fced173fe56dd6e91244f0ef70d1f74b

commit | commitdiff | tree

Ruben Brunk [Mon, 11 Mar 2013 18:38:59 +0000 (11:38 -0700)]

am 9ecbf66d: Merge "Clear Gallery\'s bitmap pool on photo editor start. Minor refactoring." into gb-ub-photos-bryce

* commit '9ecbf66d54204f78e9b51bee6f76d2bde1dc6882':
Clear Gallery's bitmap pool on photo editor start. Minor refactoring.

commit | commitdiff | tree

Ruben Brunk [Mon, 11 Mar 2013 18:37:55 +0000 (18:37 +0000)]

Merge "Clear Gallery's bitmap pool on photo editor start. Minor refactoring." into gb-ub-photos-bryce

commit | commitdiff | tree

Ruben Brunk [Mon, 11 Mar 2013 16:53:16 +0000 (09:53 -0700)]

Clear Gallery's bitmap pool on photo editor start. Minor refactoring.

Change-Id: I02e29bf6cfd85a9cecd3850f8828cccae91badd2

commit | commitdiff | tree

nicolasroard [Mon, 11 Mar 2013 17:39:40 +0000 (10:39 -0700)]

am 6019ad95: Add tiled background

* commit '6019ad95f1c85786488d2d4cae1cbb665d33bd30':
Add tiled background

commit | commitdiff | tree

nicolasroard [Sat, 9 Mar 2013 19:18:43 +0000 (11:18 -0800)]

Add tiled background

Change-Id: I52292f6cae4f1121795829663dc4738cb38a953b

commit | commitdiff | tree

nicolasroard [Sat, 9 Mar 2013 18:15:25 +0000 (10:15 -0800)]

am 402dd963: Clear border resources to save memory

* commit '402dd963ad8fb1dfed81cca63cbaf82e93533a94':
Clear border resources to save memory

commit | commitdiff | tree

nicolasroard [Sat, 9 Mar 2013 18:06:49 +0000 (10:06 -0800)]

Clear border resources to save memory

Change-Id: I1bd9668eb3c7b2815bdc0123445185c8f9d21ad2

commit | commitdiff | tree

nicolasroard [Sat, 9 Mar 2013 01:32:36 +0000 (17:32 -0800)]

am 259bb0f4: Merge "Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup" into gb-ub-photos-bryce

* commit '259bb0f4a960d87bc0d3fa7d3b9f626bf1f16d0c':
Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup

commit | commitdiff | tree

nicolasroard [Sat, 9 Mar 2013 01:31:02 +0000 (01:31 +0000)]

Merge "Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup" into gb-ub-photos-bryce

commit | commitdiff | tree

nicolasroard [Thu, 7 Mar 2013 23:16:59 +0000 (15:16 -0800)]

Memory usage improvements, speed improvement
- free filters resources agressively
- implements multiple rendering pipelines
- some cleanup

Change-Id: Ib9ed268b0b2662d0bf5c049adcf046b556954c37

commit | commitdiff | tree

Bobby Georgescu [Fri, 8 Mar 2013 23:47:58 +0000 (15:47 -0800)]

am 08157c9c: Merge "Add sharing support" into gb-ub-photos-bryce

* commit '08157c9c2a1eb63dabd756f49e7b8fefe4b25c50':
Add sharing support

commit | commitdiff | tree

Bobby Georgescu [Fri, 8 Mar 2013 23:46:23 +0000 (23:46 +0000)]

Merge "Add sharing support" into gb-ub-photos-bryce

commit | commitdiff | tree

Bobby Georgescu [Thu, 7 Mar 2013 22:15:57 +0000 (14:15 -0800)]

Add sharing support

Change-Id: I2c7f18b0d6dd057c1fba96c1133d563f32abf55c

commit | commitdiff | tree

nicolasroard [Fri, 8 Mar 2013 23:30:27 +0000 (15:30 -0800)]

am 0f1d09c9: Merge "Implements double-tap to zoom" into gb-ub-photos-bryce

* commit '0f1d09c93b961369a0e6aef7b6ec708052099e21':
Implements double-tap to zoom

commit | commitdiff | tree

nicolasroard [Fri, 8 Mar 2013 23:28:51 +0000 (23:28 +0000)]

Merge "Implements double-tap to zoom" into gb-ub-photos-bryce

commit | commitdiff | tree

Bart Sears [Fri, 8 Mar 2013 22:19:48 +0000 (14:19 -0800)]

am db2a1e4d: Merge "Bump up the version number to 1.1.40004" into gb-ub-photos-bryce

* commit 'db2a1e4d1091f3422845d48d4b24cb6995fc68f8':
Bump up the version number to 1.1.40004

commit | commitdiff | tree

Bart Sears [Fri, 8 Mar 2013 22:18:01 +0000 (22:18 +0000)]

Merge "Bump up the version number to 1.1.40004" into gb-ub-photos-bryce

commit | commitdiff | tree

Bart Sears [Fri, 8 Mar 2013 21:49:24 +0000 (13:49 -0800)]

Bump up the version number to 1.1.40004

Change-Id: If5e430e9877c6b881f33893a544313eff0647ce5

commit | commitdiff | tree

John Reck [Fri, 8 Mar 2013 21:08:23 +0000 (13:08 -0800)]

am f6e687bc: Support clicking on photos to view them

* commit 'f6e687bc30887695374580712092aeb917c84253':
Support clicking on photos to view them

commit | commitdiff | tree

John Reck [Fri, 8 Mar 2013 19:19:27 +0000 (11:19 -0800)]

Support clicking on photos to view them

Change-Id: I511af0cbe46c833d81cbbd563b9c2b4feec2bffe

commit | commitdiff | tree

John Reck [Fri, 8 Mar 2013 18:48:28 +0000 (10:48 -0800)]

am d3d2e276: Support rotation

* commit 'd3d2e2763bb4187a2dd3ac350d3a3c51d092890a':
Support rotation

commit | commitdiff | tree

John Reck [Fri, 8 Mar 2013 02:07:05 +0000 (18:07 -0800)]

Support rotation

Change-Id: Ic93bed50851f788803124ea2453128fd0497a746

commit | commitdiff | tree

John Reck [Fri, 8 Mar 2013 01:36:40 +0000 (17:36 -0800)]

am f1787e59: Merge "Fix stuff" into gb-ub-photos-bryce

* commit 'f1787e59ee4a6da2604d33eae36e59c15eee7523':
Fix stuff

commit | commitdiff | tree

John Reck [Fri, 8 Mar 2013 01:34:24 +0000 (01:34 +0000)]

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

commit | commitdiff | tree

John Reck [Thu, 7 Mar 2013 23:50:38 +0000 (15:50 -0800)]

Fix stuff

Change-Id: Ib263a00a13f169388e6ee796359255fda2a26b37

commit | commitdiff | tree

Bobby Georgescu [Thu, 7 Mar 2013 23:46:58 +0000 (15:46 -0800)]

am 33a5a21f: Merge "Add possibility for UX improvement measurements" into gb-ub-photos-bryce

* commit '33a5a21f513209bd6261b88b060e63ed044b7755':
Add possibility for UX improvement measurements

commit | commitdiff | tree

Bobby Georgescu [Thu, 7 Mar 2013 23:44:43 +0000 (23:44 +0000)]

Merge "Add possibility for UX improvement measurements" into gb-ub-photos-bryce

commit | commitdiff | tree

Tim Murray [Thu, 7 Mar 2013 22:43:13 +0000 (14:43 -0800)]

am de72a83d: Merge "Add convertRGBAtoA." into gb-ub-photos-bryce

* commit 'de72a83d12de1183c8382c609af2da6ac829c011':
Add convertRGBAtoA.

commit | commitdiff | tree

Tim Murray [Thu, 7 Mar 2013 22:41:46 +0000 (22:41 +0000)]

Merge "Add convertRGBAtoA." into gb-ub-photos-bryce

commit | commitdiff | tree

Bobby Georgescu [Thu, 7 Mar 2013 22:16:48 +0000 (14:16 -0800)]

am 62a1046c: Merge "Album set shim" into gb-ub-photos-bryce

* commit '62a1046c9482b4ac54d73130623ba7e37da2f275':
Album set shim

commit | commitdiff | tree

Bobby Georgescu [Thu, 7 Mar 2013 22:14:59 +0000 (22:14 +0000)]

Merge "Album set shim" into gb-ub-photos-bryce

commit | commitdiff | tree

Tim Murray [Thu, 7 Mar 2013 22:00:45 +0000 (14:00 -0800)]

Add convertRGBAtoA.

Change-Id: I358bc0517480883c470df51189f46fb238fde101

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 21:56:14 +0000 (13:56 -0800)]

am 6f3bd23d: Merge "Add batch operations to PhotoProvider" into gb-ub-photos-bryce

* commit '6f3bd23d7fd83a67f5e357939b06057f40051df3':
Add batch operations to PhotoProvider

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 21:54:29 +0000 (21:54 +0000)]

Merge "Add batch operations to PhotoProvider" into gb-ub-photos-bryce

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 17:02:26 +0000 (09:02 -0800)]

Add batch operations to PhotoProvider

Change-Id: I36b2f0305e2ef7502df7b896c8baedc86519ac52

commit | commitdiff | tree

Bobby Georgescu [Thu, 7 Mar 2013 03:54:37 +0000 (19:54 -0800)]

Album set shim

Change-Id: I12257ea09b7b5bc4b1d5ef638e685c66df86538a

commit | commitdiff | tree

John Reck [Thu, 7 Mar 2013 19:03:22 +0000 (11:03 -0800)]

am 2ff8d800: recycle bitmaps

* commit '2ff8d80018c27abdd475a7610ab3d684c4b33acb':
recycle bitmaps

commit | commitdiff | tree

John Reck [Thu, 7 Mar 2013 19:00:29 +0000 (11:00 -0800)]

recycle bitmaps

Change-Id: I3afda4f009fda07b4e2858cb65dee4444f8484e5

commit | commitdiff | tree

Mangesh Ghiware [Thu, 7 Mar 2013 17:31:31 +0000 (09:31 -0800)]

am 17362f81: Remove redundant Album NAME (replaced by TITLE)

* commit '17362f811fa92ff0d9f92b3c733f08704de2f135':
Remove redundant Album NAME (replaced by TITLE)

commit | commitdiff | tree

Mangesh Ghiware [Thu, 7 Mar 2013 16:55:18 +0000 (08:55 -0800)]

Remove redundant Album NAME (replaced by TITLE)

Change-Id: I0482f8b4bd85e07aefe4af02b1e8dab4702eb9f6

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 16:57:14 +0000 (08:57 -0800)]

am cad2ab01: Merge "Add inserts to PhotoProvider." into gb-ub-photos-bryce

* commit 'cad2ab01fe5d95f8a98f15c898fe532f85daeb89':
Add inserts to PhotoProvider.

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 16:57:13 +0000 (08:57 -0800)]

am e1796ac1: Merge "Add album cover art downloading." into gb-ub-photos-bryce

* commit 'e1796ac13fad20584ae95767f6790c4090bffc3a':
Add album cover art downloading.

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 16:56:23 +0000 (16:56 +0000)]

Merge "Add inserts to PhotoProvider." into gb-ub-photos-bryce

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 16:55:46 +0000 (16:55 +0000)]

Merge "Add album cover art downloading." into gb-ub-photos-bryce

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 01:21:29 +0000 (17:21 -0800)]

Add inserts to PhotoProvider.

Change-Id: Ie91df59975d185948c7c2fd96432d311847c3e00

commit | commitdiff | tree

George Mount [Wed, 6 Mar 2013 23:35:48 +0000 (15:35 -0800)]

Add album cover art downloading.

Change-Id: I660761c3bf59b1b314be9674fc3f1e43f307c686

commit | commitdiff | tree

Baligh Uddin [Thu, 7 Mar 2013 04:51:35 +0000 (20:51 -0800)]

am 7607b9a9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '7607b9a9f5be5486595d8040c01a506a125ed7b6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 7 Mar 2013 04:50:47 +0000 (04:50 +0000)]

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

commit | commitdiff | tree

Baligh Uddin [Thu, 7 Mar 2013 04:50:12 +0000 (04:50 +0000)]

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

commit | commitdiff | tree

John Reck [Thu, 7 Mar 2013 00:54:11 +0000 (16:54 -0800)]

am 0eed2b56: Merge "Data provider shim" into gb-ub-photos-bryce

* commit '0eed2b56583420f85a02f01707e49f37467bbad7':
Data provider shim

commit | commitdiff | tree

John Reck [Thu, 7 Mar 2013 00:53:13 +0000 (00:53 +0000)]

Merge "Data provider shim" into gb-ub-photos-bryce

commit | commitdiff | tree

John Reck [Thu, 7 Mar 2013 00:36:45 +0000 (16:36 -0800)]

Data provider shim

Bolt the new UI framework on top of the old data model temporarily
to unblock UI work

Change-Id: I2f61f70647faca1f6a95b1f02f719ec4277fa5fb

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 00:06:45 +0000 (16:06 -0800)]

am 1732a9cf: Merge "Add required fields to PhotoProvider." into gb-ub-photos-bryce

* commit '1732a9cfe68564c7b55b0157575561ecf0f9fdc4':
Add required fields to PhotoProvider.

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 00:05:42 +0000 (00:05 +0000)]

Merge "Add required fields to PhotoProvider." into gb-ub-photos-bryce

commit | commitdiff | tree

George Mount [Wed, 6 Mar 2013 19:49:10 +0000 (11:49 -0800)]

Add required fields to PhotoProvider.

Change-Id: I1e830702412d4431ba3b01fe4945a4818385b6cd

commit | commitdiff | tree

Bobby Georgescu [Wed, 6 Mar 2013 23:12:27 +0000 (15:12 -0800)]

am fd21feac: Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryce

* commit 'fd21feacb7bca840056f82ad219d6e93374a73c2':
Preliminary AlbumSet UI

commit | commitdiff | tree

Bobby Georgescu [Wed, 6 Mar 2013 23:10:22 +0000 (23:10 +0000)]

Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryce

commit | commitdiff | tree

Doris Liu [Wed, 6 Mar 2013 22:52:15 +0000 (14:52 -0800)]

am 8d2a3057: Fix camera switcher mode picker

* commit '8d2a3057bb8a4a3bbaa5be3ef9ac91f00ff50957':
Fix camera switcher mode picker

commit | commitdiff | tree

Doris Liu [Wed, 6 Mar 2013 21:56:53 +0000 (13:56 -0800)]

Fix camera switcher mode picker

Bug: 8330008
Change-Id: I08ccd38a6898e88d28214cceb22cee6688ce0b3f

commit | commitdiff | tree

John Hoford [Wed, 6 Mar 2013 21:07:35 +0000 (13:07 -0800)]

am 4e330be1: Merge "fix undo bug" into gb-ub-photos-bryce

* commit '4e330be1512162dd0ed4988352cd32017758f3d6':
fix undo bug

commit | commitdiff | tree

John Hoford [Wed, 6 Mar 2013 21:05:05 +0000 (21:05 +0000)]

Merge "fix undo bug" into gb-ub-photos-bryce

commit | commitdiff | tree

John Hoford [Wed, 6 Mar 2013 20:26:37 +0000 (12:26 -0800)]

fix undo bug

bug:8319433
Change-Id: If6bea005677b63267130d446e7b0298d21bbb3be

commit | commitdiff | tree

Doris Liu [Wed, 6 Mar 2013 19:42:59 +0000 (11:42 -0800)]

am 8892e5e7: Fix NPE in switcher popup

* commit '8892e5e7ffa1f33b527b7753b07723dfd685a9cd':
Fix NPE in switcher popup

commit | commitdiff | tree

Doris Liu [Wed, 6 Mar 2013 19:22:48 +0000 (11:22 -0800)]

Fix NPE in switcher popup

Bug: 8327966
Change-Id: I4181a59871c065435756c100b3e8b43930781ee5

commit | commitdiff | tree

Baligh Uddin [Wed, 6 Mar 2013 19:13:56 +0000 (11:13 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Wed, 6 Mar 2013 19:13:25 +0000 (11:13 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Wed, 6 Mar 2013 06:03:31 +0000 (22:03 -0800)]

am f831c736: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'f831c736a3c0c20b59873d98f8abe5b2a234f402':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 6 Mar 2013 06:02:43 +0000 (06:02 +0000)]

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

commit | commitdiff | tree

Baligh Uddin [Wed, 6 Mar 2013 06:02:21 +0000 (06:02 +0000)]

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

commit | commitdiff | tree

Doris Liu [Wed, 6 Mar 2013 03:48:28 +0000 (19:48 -0800)]

am 7f51a845: Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce

* commit '7f51a8455b34d794797388d31c1b42b0de9844d5':
Add a black bar symmetric to nav bar

commit | commitdiff | tree

Doris Liu [Wed, 6 Mar 2013 03:48:27 +0000 (19:48 -0800)]

am 457bab95: Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce

* commit '457bab952ea6b8babf2d37c817f06aed3829ba61':
Keep camera controls on the same physical side

commit | commitdiff | tree

Doris Liu [Wed, 6 Mar 2013 03:47:13 +0000 (03:47 +0000)]

Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce

commit | commitdiff | tree

Doris Liu [Wed, 6 Mar 2013 03:46:52 +0000 (03:46 +0000)]

Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce

commit | commitdiff | tree

Doris Liu [Tue, 5 Mar 2013 17:54:25 +0000 (09:54 -0800)]

Add a black bar symmetric to nav bar

Also fix bug: 8323926
Change-Id: I4886b285dee8ad71ad72a55e96bf699b7c18c9f4

commit | commitdiff | tree

Bobby Georgescu [Mon, 4 Mar 2013 19:44:49 +0000 (11:44 -0800)]

Preliminary AlbumSet UI

Change-Id: Ie99bd2939bfcb47c80605cbb22b84b1064098e91