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

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

am 262f0b97: am 38b80059: am d11b5c3f: am de72a83d: Merge "Add convertRGBAtoA." into gb-ub-photos-bryce

* commit '262f0b97bc0f3dd0952ce4827f32a7a7583a5094':
Add convertRGBAtoA.

commit | commitdiff | tree

Tim Murray [Thu, 7 Mar 2013 22:47:27 +0000 (22:47 +0000)]

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

* commit '38b8005915648ed5dccd8270d5f81d1b2fa05e26':
Add convertRGBAtoA.

commit | commitdiff | tree

Tim Murray [Thu, 7 Mar 2013 22:44:43 +0000 (22:44 +0000)]

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

* commit 'd11b5c3f37cc1903e953fae0aed3cd9a964e297d':
Add convertRGBAtoA.

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:26:25 +0000 (22:26 +0000)]

am 975f427f: am e7d20532: am 88f8328b: am 62a1046c: Merge "Album set shim" into gb-ub-photos-bryce

* commit '975f427f901bec6068b23f4b708f4209d1336b39':
Album set shim

commit | commitdiff | tree

Bobby Georgescu [Thu, 7 Mar 2013 22:23:39 +0000 (22:23 +0000)]

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

* commit 'e7d20532cb209f76d9aa90039834e84d27dcc48c':
Album set shim

commit | commitdiff | tree

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

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

* commit '88f8328bf03ea1e037c4160a866655bc3851850f':
Album set shim

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

George Mount [Thu, 7 Mar 2013 22:01:58 +0000 (22:01 +0000)]

am 77799292: am 7140cb1f: am 5a95ad86: am 6f3bd23d: Merge "Add batch operations to PhotoProvider" into gb-ub-photos-bryce

* commit '77799292189c7c2a827a0aa8ddfbd7f6a6d3de91':
Add batch operations to PhotoProvider

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 22:00:44 +0000 (22:00 +0000)]

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

* commit '7140cb1f127b0837fc9a852003a9ba242aa40108':
Add batch operations to PhotoProvider

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 21:58:10 +0000 (21:58 +0000)]

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

* commit '5a95ad869eedac439c1f9ef21c48cc0eb28e30fa':
Add batch operations to PhotoProvider

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

John Reck [Thu, 7 Mar 2013 20:00:10 +0000 (20:00 +0000)]

am e7f8c874: am 47435801: am a43b3787: am 2ff8d800: recycle bitmaps

* commit 'e7f8c87428d11fd4a1bbe7185ab42f1a3689a49f':
recycle bitmaps

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:06:40 +0000 (19:06 +0000)]

am 47435801: am a43b3787: am 2ff8d800: recycle bitmaps

* commit '47435801379d4c9b4f9970f62dacb6a14b7d23bb':
recycle bitmaps

commit | commitdiff | tree

John Reck [Thu, 7 Mar 2013 19:05:22 +0000 (19:05 +0000)]

am a43b3787: am 2ff8d800: recycle bitmaps

* commit 'a43b378741be7a75eaafa5f6eba90e520a25b80b':
recycle bitmaps

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:45:57 +0000 (17:45 +0000)]

am 1b2fe8d9: am c6c7948a: am c1c711ee: am 17362f81: Remove redundant Album NAME (replaced by TITLE)

* commit '1b2fe8d9b288cd26225a0990fba807dcdcdf0296':
Remove redundant Album NAME (replaced by TITLE)

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 17:45:47 +0000 (17:45 +0000)]

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

* commit 'a02f7da8863c4afe0b4854c6d101028833d50923':
Add inserts to PhotoProvider.

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 17:45:46 +0000 (17:45 +0000)]

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

* commit '4535124df7341e12fa3e4ac0dc436f346b9f0ef5':
Add album cover art downloading.

commit | commitdiff | tree

Baligh Uddin [Thu, 7 Mar 2013 17:45:46 +0000 (17:45 +0000)]

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

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

commit | commitdiff | tree

Baligh Uddin [Thu, 7 Mar 2013 17:45:45 +0000 (17:45 +0000)]

am 581bd60e: (-s ours) am 766843cf: (-s ours) am 956d934e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '581bd60eb585e037105ab81a0933b4efb2d61e9c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

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

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

commit | commitdiff | tree

Mangesh Ghiware [Thu, 7 Mar 2013 17:35:55 +0000 (17:35 +0000)]

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

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

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 17:34:42 +0000 (17:34 +0000)]

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

* commit 'add697405fbe94d0850eb88c6db7c42b494744ec':
Add inserts to PhotoProvider.

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 17:34:42 +0000 (17:34 +0000)]

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

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

commit | commitdiff | tree

Baligh Uddin [Thu, 7 Mar 2013 17:34:41 +0000 (17:34 +0000)]

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

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

commit | commitdiff | tree

Baligh Uddin [Thu, 7 Mar 2013 17:34:41 +0000 (17:34 +0000)]

am 766843cf: (-s ours) am 956d934e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '766843cf39bda36c214280b722e649de76599ac2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 7 Mar 2013 17:34:40 +0000 (17:34 +0000)]

am 8cc6c923: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '8cc6c9230c8f5c9dc19db8b1680b38c6c5fc9d79':
Import translations. DO NOT MERGE

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

George Mount [Thu, 7 Mar 2013 17:31:10 +0000 (17:31 +0000)]

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

* commit '404219e55171b6fcfb666f16174b41fa25fba794':
Add inserts to PhotoProvider.

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 17:31:10 +0000 (17:31 +0000)]

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

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

commit | commitdiff | tree

Baligh Uddin [Thu, 7 Mar 2013 17:30:56 +0000 (17:30 +0000)]

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

* commit '2fee25d93cbdabfb87152038b3ea788d9895921b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 7 Mar 2013 17:30:56 +0000 (17:30 +0000)]

am 956d934e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '956d934ebf9307d350babad7cc49dc33c7e8b2c7':
Import translations. DO NOT MERGE

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:37 +0000 (04:51 +0000)]

Merge "Import translations. DO NOT MERGE" into master-security-dev

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:51:18 +0000 (04:51 +0000)]

Merge "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 01:00:23 +0000 (01:00 +0000)]

am c6495d18: am e2aa63ce: am 3aaf6efa: am 0eed2b56: Merge "Data provider shim" into gb-ub-photos-bryce

* commit 'c6495d180c64cf79f422479871227a1a2f0de3de':
Data provider shim

commit | commitdiff | tree

John Reck [Thu, 7 Mar 2013 00:58:42 +0000 (00:58 +0000)]

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

* commit 'e2aa63ce9f3ee1bb494315fd0278034313a5cd37':
Data provider shim

commit | commitdiff | tree

John Reck [Thu, 7 Mar 2013 00:56:12 +0000 (00:56 +0000)]

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

* commit '3aaf6efa0f55721976b2e055c6b23485b6786734':
Data provider shim

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:14:04 +0000 (00:14 +0000)]

am 2466a1e9: am eb2ccd67: am 9f387c22: am 1732a9cf: Merge "Add required fields to PhotoProvider." into gb-ub-photos-bryce

* commit '2466a1e9af19c9ffc9d3b52afe8021ad7379dff3':
Add required fields to PhotoProvider.

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 00:12:03 +0000 (00:12 +0000)]

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

* commit 'eb2ccd677d861607933fdd531d0f2c1c7893bc2a':
Add required fields to PhotoProvider.

commit | commitdiff | tree

George Mount [Thu, 7 Mar 2013 00:09:11 +0000 (00:09 +0000)]

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

* commit '9f387c22ac516f0f4df69034dbdafc794d08cff9':
Add required fields to PhotoProvider.

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:18:30 +0000 (23:18 +0000)]

am 4d1704ee: am e0f28954: am 687c2a2f: am fd21feac: Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryce

* commit '4d1704ee44ba214c2d5b62c2948ae196e2c656a1':
Preliminary AlbumSet UI

commit | commitdiff | tree

Bobby Georgescu [Wed, 6 Mar 2013 23:15:49 +0000 (23:15 +0000)]

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

* commit 'e0f289542c6726ef9fc7d99bd114a85374656e8e':
Preliminary AlbumSet UI

commit | commitdiff | tree

Bobby Georgescu [Wed, 6 Mar 2013 23:13:58 +0000 (23:13 +0000)]

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

* commit '687c2a2f596c39ebff119b6f6250563039c5eed0':
Preliminary AlbumSet UI

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:59:43 +0000 (22:59 +0000)]

am f8d28af5: am 4a3f34a6: am 7233f395: am 8d2a3057: Fix camera switcher mode picker

* commit 'f8d28af51ffec5b1a6fd7ce4cdcebc6819acb4aa':
Fix camera switcher mode picker

commit | commitdiff | tree

Doris Liu [Wed, 6 Mar 2013 22:57:10 +0000 (22:57 +0000)]

am 4a3f34a6: am 7233f395: am 8d2a3057: Fix camera switcher mode picker

* commit '4a3f34a682e11002daefbc0433906af6d4cd0bf2':
Fix camera switcher mode picker

commit | commitdiff | tree

Doris Liu [Wed, 6 Mar 2013 22:54:39 +0000 (22:54 +0000)]

am 7233f395: am 8d2a3057: Fix camera switcher mode picker

* commit '7233f39558f0d80d697d3d5415ed66bf0d9a162e':
Fix camera switcher mode picker

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:14:59 +0000 (21:14 +0000)]

am 47b80d01: am 92ca581d: am 997b0a75: am 4e330be1: Merge "fix undo bug" into gb-ub-photos-bryce

* commit '47b80d01bdb690fb0e38a9954569927df8297f10':
fix undo bug

commit | commitdiff | tree

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

am 92ca581d: am 997b0a75: am 4e330be1: Merge "fix undo bug" into gb-ub-photos-bryce

* commit '92ca581dc9314ec139cfc1f9f504f98c5affff2f':
fix undo bug

commit | commitdiff | tree

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

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

* commit '997b0a7578ecbcdf89152f18611f62230d0d0411':
fix undo bug

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:48:11 +0000 (19:48 +0000)]

am db187215: am 04cdfc09: am 38f86e40: am 8892e5e7: Fix NPE in switcher popup

* commit 'db187215d13ad28975cb52bb4bb7c809f09bcbd5':
Fix NPE in switcher popup

commit | commitdiff | tree

Doris Liu [Wed, 6 Mar 2013 19:47:04 +0000 (19:47 +0000)]

am 04cdfc09: am 38f86e40: am 8892e5e7: Fix NPE in switcher popup

* commit '04cdfc09e7712fd69a14f75642940a4431de8b4b':
Fix NPE in switcher popup

commit | commitdiff | tree

Doris Liu [Wed, 6 Mar 2013 19:45:48 +0000 (19:45 +0000)]

am 38f86e40: am 8892e5e7: Fix NPE in switcher popup

* commit '38f86e402df3d99032b22eeac4578efdfa269f12':
Fix NPE in switcher popup

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:14:54 +0000 (11:14 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

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

Import translations. DO NOT MERGE

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

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 16:58:06 +0000 (16:58 +0000)]

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

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

commit | commitdiff | tree

Baligh Uddin [Wed, 6 Mar 2013 16:58:05 +0000 (16:58 +0000)]

am 88e4fa77: (-s ours) am 3bc1bc3c: (-s ours) am 670444be: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '88e4fa77a8acc61063adcff7deda4f049c1559ac':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Doris Liu [Wed, 6 Mar 2013 16:58:04 +0000 (16:58 +0000)]

am 4e0971d5: am 0e53c3a7: am 9a08794f: am 7f51a845: Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce

* commit '4e0971d53240836b20cb29ca8c8d7df2f1ac6211':
Add a black bar symmetric to nav bar

commit | commitdiff | tree

Doris Liu [Wed, 6 Mar 2013 16:58:04 +0000 (16:58 +0000)]

am 1fbeaeb7: am 2e4f5399: am 62bacd5d: am 457bab95: Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce

* commit '1fbeaeb7da57a674ff6ad6612e72800bffcdf0bc':
Keep camera controls on the same physical side

commit | commitdiff | tree

Baligh Uddin [Wed, 6 Mar 2013 16:53:31 +0000 (16:53 +0000)]

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

* commit '6846c5d0b7373a2c515e0573041e57f0989171c7':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 6 Mar 2013 16:53:30 +0000 (16:53 +0000)]

am 3bc1bc3c: (-s ours) am 670444be: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '3bc1bc3ca7aed8582e7990edce13b25239bd54ff':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Doris Liu [Wed, 6 Mar 2013 16:53:30 +0000 (16:53 +0000)]

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

* commit '0e53c3a74f4ab4a7aab04ff048a62ede0a737c08':
Add a black bar symmetric to nav bar

commit | commitdiff | tree

Doris Liu [Wed, 6 Mar 2013 16:53:29 +0000 (16:53 +0000)]

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

* commit '2e4f5399d2e3b79708d743672d30e480157a6b12':
Keep camera controls on the same physical side

commit | commitdiff | tree

Baligh Uddin [Wed, 6 Mar 2013 16:48:01 +0000 (16:48 +0000)]

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

* commit '2962966e5f274b77380cf5716a61aff5c1b55355':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 6 Mar 2013 16:48:01 +0000 (16:48 +0000)]

am 670444be: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '670444be68f153511e05af6df89beeabe89313b2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Doris Liu [Wed, 6 Mar 2013 16:47:53 +0000 (16:47 +0000)]

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

* commit '9a08794fcb62acde0cc1dcd09a739060d1a4ea0b':
Add a black bar symmetric to nav bar