OSDN Git Service
nicolasroard [Fri, 19 Oct 2012 06:51:05 +0000 (23:51 -0700)]
am
fd0160d0: am
f2c63869: am
0f327c32: am
c5590eb1: Improves Curves & Crop UI
* commit '
fd0160d0f3691169de8195f2bcf82974545c4a05':
Improves Curves & Crop UI
nicolasroard [Fri, 19 Oct 2012 06:49:00 +0000 (23:49 -0700)]
am
f2c63869: am
0f327c32: am
c5590eb1: Improves Curves & Crop UI
* commit '
f2c63869e3a347d5c86d1bdd2b759695a98bfaa0':
Improves Curves & Crop UI
nicolasroard [Fri, 19 Oct 2012 06:46:55 +0000 (23:46 -0700)]
am
0f327c32: am
c5590eb1: Improves Curves & Crop UI
* commit '
0f327c3297253c2ea67ec7ae32c0e6ba4917e648':
Improves Curves & Crop UI
nicolasroard [Fri, 19 Oct 2012 06:44:54 +0000 (23:44 -0700)]
am
c5590eb1: Improves Curves & Crop UI
* commit '
c5590eb1a20b112e67e4c43684790587f844fc6b':
Improves Curves & Crop UI
nicolasroard [Fri, 19 Oct 2012 00:53:44 +0000 (17:53 -0700)]
Improves Curves & Crop UI
bug:
7361722
- Use new assets
- Add a margin
- Add a popup menu
- Add a new button showing the current channel
- Add popup menu, new assets, new button for Crop as well
Change-Id: I0e09098e3135d2213f7f4cd64cd75a3a518a07da
Doris Liu [Fri, 19 Oct 2012 05:01:38 +0000 (22:01 -0700)]
am
8d2cf47a: am
14800413: am
c0ecc707: am
4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
* commit '
8d2cf47a5a658d075c41648ea6769a4379cf33c6':
Adding support for tiny planet in gallery
Doris Liu [Fri, 19 Oct 2012 04:59:33 +0000 (21:59 -0700)]
am
14800413: am
c0ecc707: am
4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
* commit '
1480041324f1fc788258a197236c8e100d1ae4f6':
Adding support for tiny planet in gallery
Doris Liu [Fri, 19 Oct 2012 04:56:28 +0000 (21:56 -0700)]
am
c0ecc707: am
4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
* commit '
c0ecc7076a32b184fb4f730996990e0345be804b':
Adding support for tiny planet in gallery
Doris Liu [Fri, 19 Oct 2012 04:54:54 +0000 (21:54 -0700)]
am
4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
* commit '
4b6c20de6fef0aacb464398f2a6bf4b7959f4726':
Adding support for tiny planet in gallery
Doris Liu [Fri, 19 Oct 2012 04:52:49 +0000 (21:52 -0700)]
Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
Bobby Georgescu [Fri, 19 Oct 2012 03:59:36 +0000 (20:59 -0700)]
am
5eb26a49: am
0be9d911: am
51283054: am
b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches
* commit '
5eb26a49befb259cadd9e2ee2a992e205699a759':
Fix Gallery crash
Bobby Georgescu [Fri, 19 Oct 2012 03:57:02 +0000 (20:57 -0700)]
am
0be9d911: am
51283054: am
b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches
* commit '
0be9d9116c4a016cda95b8847c7c91a34d12b55c':
Fix Gallery crash
Bobby Georgescu [Fri, 19 Oct 2012 03:54:39 +0000 (20:54 -0700)]
am
51283054: am
b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches
* commit '
51283054901d747c8e2db4609aa28590913b4ee7':
Fix Gallery crash
Bobby Georgescu [Fri, 19 Oct 2012 03:52:08 +0000 (20:52 -0700)]
am
b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches
* commit '
b42ea0266c3b10e0b40119ec5c0adf6e9bb8973b':
Fix Gallery crash
Bobby Georgescu [Fri, 19 Oct 2012 03:50:19 +0000 (20:50 -0700)]
Merge "Fix Gallery crash" into gb-ub-photos-arches
Scott Main [Fri, 19 Oct 2012 01:56:34 +0000 (18:56 -0700)]
am
ad96fe21: (-s ours) am
587e7a62: am
44adb1ee: am
9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
* commit '
ad96fe2195f19623e8030bd469ffa6ae5c1554d9':
DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
Scott Main [Fri, 19 Oct 2012 01:54:24 +0000 (18:54 -0700)]
am
587e7a62: am
44adb1ee: am
9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
* commit '
587e7a62fd32cdd6d2260088dd474ac08fcf0b8f':
DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
Scott Main [Fri, 19 Oct 2012 01:51:43 +0000 (18:51 -0700)]
am
44adb1ee: am
9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
* commit '
44adb1ee0826b82ca9e25cd8fc7577663f237b83':
DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
Scott Main [Fri, 19 Oct 2012 01:49:22 +0000 (18:49 -0700)]
am
9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
* commit '
9baf2fd55613ce3f545da2d341c8e8a36b82ee78':
DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
Doris Liu [Thu, 18 Oct 2012 22:01:35 +0000 (15:01 -0700)]
Adding support for tiny planet in gallery
Bug:
7344427
Change-Id: I6fad734b28022f45cc551d81212ee4d3a0c867b2
Bobby Georgescu [Fri, 19 Oct 2012 00:56:20 +0000 (17:56 -0700)]
Fix Gallery crash
Bug:
7268985
Change-Id: I88c823d3270cb74d6e2bd7df5b6b6ed9e28f16a6
Scott Main [Thu, 18 Oct 2012 18:59:47 +0000 (11:59 -0700)]
DO NOT MERGE
cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8
remove old fashioned Dream, no longer supported
Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8
Conflicts:
AndroidManifest.xml
Bobby Georgescu [Fri, 19 Oct 2012 00:41:39 +0000 (17:41 -0700)]
am
9386b24b: am
6cef17ee: am
856ec7e5: am
79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
* commit '
9386b24bae159ff6a7a7204099a9e350ee1ceaab':
Do not show "Filmstrip view" text when photo is fullscreen
Bobby Georgescu [Fri, 19 Oct 2012 00:40:26 +0000 (17:40 -0700)]
am
6cef17ee: am
856ec7e5: am
79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
* commit '
6cef17ee61523b7bc6dee1009596eb5fdafa9c72':
Do not show "Filmstrip view" text when photo is fullscreen
Bobby Georgescu [Fri, 19 Oct 2012 00:38:09 +0000 (17:38 -0700)]
am
856ec7e5: am
79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
* commit '
856ec7e57f8e02617dab5fdeb43604fd86f9d95c':
Do not show "Filmstrip view" text when photo is fullscreen
John Reck [Fri, 19 Oct 2012 00:36:41 +0000 (17:36 -0700)]
am
456cc1d4: am
a7b6bb99: am
5415b4cb: am
014a111f: Save XMP & Exif data on edited photos
* commit '
456cc1d47eb19fc1aa6277450bc21806f29fc8a6':
Save XMP & Exif data on edited photos
Bobby Georgescu [Fri, 19 Oct 2012 00:36:21 +0000 (17:36 -0700)]
am
79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
* commit '
79704855fb9b83acf9dc505f9ab1989ec1c770bc':
Do not show "Filmstrip view" text when photo is fullscreen
Bobby Georgescu [Fri, 19 Oct 2012 00:34:27 +0000 (17:34 -0700)]
Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
John Reck [Fri, 19 Oct 2012 00:34:18 +0000 (17:34 -0700)]
am
a7b6bb99: am
5415b4cb: am
014a111f: Save XMP & Exif data on edited photos
* commit '
a7b6bb996cae7e27babf2fc6e1d7ee3f0077fd13':
Save XMP & Exif data on edited photos
John Reck [Fri, 19 Oct 2012 00:32:02 +0000 (17:32 -0700)]
am
5415b4cb: am
014a111f: Save XMP & Exif data on edited photos
* commit '
5415b4cbeb106f090f25a9913fea5d56d6e07d4f':
Save XMP & Exif data on edited photos
John Reck [Fri, 19 Oct 2012 00:30:12 +0000 (17:30 -0700)]
am
014a111f: Save XMP & Exif data on edited photos
* commit '
014a111f10a7523415ca210bc6fe1e4f00183d31':
Save XMP & Exif data on edited photos
nicolasroard [Fri, 19 Oct 2012 00:19:43 +0000 (17:19 -0700)]
am
81e30573: am
8d48e27c: am
8f6e1dc3: am
d7899c56: Fix undo/redo/back button behaviour with effects and enable history
* commit '
81e3057341164f276482a2470a9058cc928ae7de':
Fix undo/redo/back button behaviour with effects and enable history
nicolasroard [Fri, 19 Oct 2012 00:16:02 +0000 (17:16 -0700)]
am
8d48e27c: am
8f6e1dc3: am
d7899c56: Fix undo/redo/back button behaviour with effects and enable history
* commit '
8d48e27c64e7d0dd907813967903219bc4b623c2':
Fix undo/redo/back button behaviour with effects and enable history
nicolasroard [Fri, 19 Oct 2012 00:13:26 +0000 (17:13 -0700)]
am
8f6e1dc3: am
d7899c56: Fix undo/redo/back button behaviour with effects and enable history
* commit '
8f6e1dc361d57e8cabb6dcce3d06edaa1c25f21c':
Fix undo/redo/back button behaviour with effects and enable history
nicolasroard [Fri, 19 Oct 2012 00:11:58 +0000 (17:11 -0700)]
am
d7899c56: Fix undo/redo/back button behaviour with effects and enable history
* commit '
d7899c56b8df278dfd6720ae11eadc2f89fe8094':
Fix undo/redo/back button behaviour with effects and enable history
John Reck [Thu, 18 Oct 2012 01:47:39 +0000 (18:47 -0700)]
Save XMP & Exif data on edited photos
Bug:
7293391
Bug:
7329199
Bug:
7376660
Change-Id: I23b1637a9a494c1dc43b1fc1359cdaf3e75bc23f
nicolasroard [Thu, 18 Oct 2012 00:46:47 +0000 (17:46 -0700)]
Fix undo/redo/back button behaviour with effects and enable history
bug:
7332980
bug:
7357734
bug:
7325872
Change-Id: Ie952a410c218c91ac927095ddcf542209fe7b90c
George Mount [Fri, 19 Oct 2012 00:02:52 +0000 (17:02 -0700)]
am
5c966337: am
79bb3b6b: am
b69af65f: am
0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches
* commit '
5c966337dd2d9c4c6861697ae85ce2dcbd20fbb5':
Remove panorama checks from supported operations.
nicolasroard [Fri, 19 Oct 2012 00:02:51 +0000 (17:02 -0700)]
am
ddd1a077: am
73483c52: am
f52d90a1: am
60d25279: Handle screen rotation
* commit '
ddd1a0771ec163ef4a3e0732a50b33852014af9b':
Handle screen rotation
George Mount [Fri, 19 Oct 2012 00:00:55 +0000 (17:00 -0700)]
am
79bb3b6b: am
b69af65f: am
0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches
* commit '
79bb3b6b2af943fc40163a79645eb79768164593':
Remove panorama checks from supported operations.
nicolasroard [Fri, 19 Oct 2012 00:00:51 +0000 (17:00 -0700)]
am
73483c52: am
f52d90a1: am
60d25279: Handle screen rotation
* commit '
73483c52364faa3dac45f812754f531417bb9a24':
Handle screen rotation
Bobby Georgescu [Thu, 18 Oct 2012 22:36:03 +0000 (15:36 -0700)]
Do not show "Filmstrip view" text when photo is fullscreen
Bug: 243374
Change-Id: I2d0a1d56e6c2d833d9d75041b30afcb988635c49
George Mount [Thu, 18 Oct 2012 23:57:52 +0000 (16:57 -0700)]
am
b69af65f: am
0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches
* commit '
b69af65f5c1e957f4b5b39c7c381c7a28eb409ce':
Remove panorama checks from supported operations.
nicolasroard [Thu, 18 Oct 2012 23:57:51 +0000 (16:57 -0700)]
am
f52d90a1: am
60d25279: Handle screen rotation
* commit '
f52d90a1610469dfa195ee89cee7a72ac2333400':
Handle screen rotation
George Mount [Thu, 18 Oct 2012 23:56:30 +0000 (16:56 -0700)]
am
0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches
* commit '
0745eba4898419aad2b6e79be137a2a1edf4d0fc':
Remove panorama checks from supported operations.
nicolasroard [Thu, 18 Oct 2012 23:55:19 +0000 (16:55 -0700)]
am
60d25279: Handle screen rotation
* commit '
60d252795f41d0cfe4d0e11b4d1e32d4547368c9':
Handle screen rotation
George Mount [Thu, 18 Oct 2012 23:54:27 +0000 (16:54 -0700)]
Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches
George Mount [Thu, 18 Oct 2012 21:20:39 +0000 (14:20 -0700)]
Remove panorama checks from supported operations.
Bug
7351383
Bug
7349438
Move panorama support checks from getSupportedOperations so
that calls to getSupportedOperations are consistent. Panorama
checks are moved to only based on callbacks.
Change-Id: Id9ff138204df84c6fb0a4c971dcea59f1220aee2
nicolasroard [Thu, 18 Oct 2012 23:16:36 +0000 (16:16 -0700)]
Handle screen rotation
bug:
7328773
Change-Id: I3c03c233a5b5a883963c8fd124c760655fd12bc7
nicolasroard [Thu, 18 Oct 2012 23:10:40 +0000 (16:10 -0700)]
am
78e7cce1: am
246456be: am
99679734: am
c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches
* commit '
78e7cce1324c887ca59f76cf0d5709425a977fbb':
Fix broken build
nicolasroard [Thu, 18 Oct 2012 23:08:43 +0000 (16:08 -0700)]
am
246456be: am
99679734: am
c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches
* commit '
246456be144200b5cd8e08dae7659cc5562a3e35':
Fix broken build
nicolasroard [Thu, 18 Oct 2012 23:06:30 +0000 (16:06 -0700)]
am
99679734: am
c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches
* commit '
99679734ef9b1665ae306fbecaa7e3ebf16d1b8e':
Fix broken build
nicolasroard [Thu, 18 Oct 2012 23:04:47 +0000 (16:04 -0700)]
am
c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches
* commit '
c6ea040010a0794bc78a43c4522cfb03d9e488e2':
Fix broken build
nicolasroard [Thu, 18 Oct 2012 23:03:08 +0000 (16:03 -0700)]
Merge "Fix broken build" into gb-ub-photos-arches
nicolasroard [Thu, 18 Oct 2012 22:59:47 +0000 (15:59 -0700)]
Fix broken build
Change-Id: I088926bd7fad32017861027d7786a4c178aca122
nicolasroard [Thu, 18 Oct 2012 22:55:00 +0000 (15:55 -0700)]
am
e54d674d: am
cb10b317: am
ff5061c8: am
4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches
* commit '
e54d674dd24649d9a08cdd15c90e53dc7623707c':
Hide curve channel picker
Bobby Georgescu [Thu, 18 Oct 2012 22:54:58 +0000 (15:54 -0700)]
am
c0e212e5: am
92cbe770: am
255dad6d: am
0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches
* commit '
c0e212e550e91c7d630729512e8453dbca85dba7':
Various transition tweaks/fixes in Gallery
nicolasroard [Thu, 18 Oct 2012 22:51:54 +0000 (15:51 -0700)]
am
cb10b317: am
ff5061c8: am
4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches
* commit '
cb10b317069ca5aeba0febeac55e265bb5b3afc0':
Hide curve channel picker
Bobby Georgescu [Thu, 18 Oct 2012 22:51:52 +0000 (15:51 -0700)]
am
92cbe770: am
255dad6d: am
0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches
* commit '
92cbe770821fcdbe07f970614e41a202ca72d04e':
Various transition tweaks/fixes in Gallery
nicolasroard [Thu, 18 Oct 2012 22:50:38 +0000 (15:50 -0700)]
am
ff5061c8: am
4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches
* commit '
ff5061c84f6dd9914387fdd226ce44780f83407c':
Hide curve channel picker
Bobby Georgescu [Thu, 18 Oct 2012 22:50:37 +0000 (15:50 -0700)]
am
255dad6d: am
0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches
* commit '
255dad6d5265b5cae74c34e3af68d86aeb313370':
Various transition tweaks/fixes in Gallery
nicolasroard [Thu, 18 Oct 2012 22:48:33 +0000 (15:48 -0700)]
am
4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches
* commit '
4aad8963b583d812d61cbaa920b914876c5fa7d2':
Hide curve channel picker
Bobby Georgescu [Thu, 18 Oct 2012 22:48:32 +0000 (15:48 -0700)]
am
0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches
* commit '
0136dc75dc4069ca36c077a8a078db64f0fc35c6':
Various transition tweaks/fixes in Gallery
nicolasroard [Thu, 18 Oct 2012 22:45:56 +0000 (15:45 -0700)]
Merge "Hide curve channel picker" into gb-ub-photos-arches
Bobby Georgescu [Thu, 18 Oct 2012 22:45:47 +0000 (15:45 -0700)]
Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches
nicolasroard [Thu, 18 Oct 2012 22:37:50 +0000 (15:37 -0700)]
Hide curve channel picker
bug:
7375053
Change-Id: I7aa5f9db44dc657b0f4282a1bb2ea41bde322d36
Bobby Georgescu [Thu, 18 Oct 2012 21:02:16 +0000 (14:02 -0700)]
Various transition tweaks/fixes in Gallery
Bug:
7376109
-Add new animation preset for photos based on UX feedback
-Fix showing of highlight when tapping album grid photo
-Move StateTransition enum to StateTransitionAnimation.State
Change-Id: I2ce57580fa6c5f34d9545561515031899eb41eb2
Sascha Haeberling [Thu, 18 Oct 2012 21:57:59 +0000 (14:57 -0700)]
am
8a4bf39b: am
a90e5aad: am
e3106a8c: am
2576a29c: First cut at a skeleton for the TinyPlanets filter.
* commit '
8a4bf39bc7605a82be31da1a377bfdf7b706c7e8':
First cut at a skeleton for the TinyPlanets filter.
Sascha Haeberling [Thu, 18 Oct 2012 21:55:35 +0000 (14:55 -0700)]
am
a90e5aad: am
e3106a8c: am
2576a29c: First cut at a skeleton for the TinyPlanets filter.
* commit '
a90e5aad36fc14582d99577cede5b74f9f940b3a':
First cut at a skeleton for the TinyPlanets filter.
Sascha Haeberling [Thu, 18 Oct 2012 21:52:47 +0000 (14:52 -0700)]
am
e3106a8c: am
2576a29c: First cut at a skeleton for the TinyPlanets filter.
* commit '
e3106a8c7fa64faaa0446a5ca94255ae0183b660':
First cut at a skeleton for the TinyPlanets filter.
Sascha Haeberling [Thu, 18 Oct 2012 21:50:09 +0000 (14:50 -0700)]
am
2576a29c: First cut at a skeleton for the TinyPlanets filter.
* commit '
2576a29cccf1d96edeef071914e8b775c230e8e8':
First cut at a skeleton for the TinyPlanets filter.
Scott Main [Thu, 18 Oct 2012 21:46:52 +0000 (14:46 -0700)]
am
6393952e: am
ad9f380f: am
aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev
* commit '
6393952e0e36db1f5373bf7107be5af2fc8e205c':
remove old fashioned Dream, no longer supported
Scott Main [Thu, 18 Oct 2012 21:44:22 +0000 (14:44 -0700)]
am
ad9f380f: am
aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev
* commit '
ad9f380f94e91fa1df8d6e628d26b9747925da4a':
remove old fashioned Dream, no longer supported
Scott Main [Thu, 18 Oct 2012 21:41:41 +0000 (14:41 -0700)]
am
aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev
* commit '
aae561e748ec9d87c7724f4acd390736eedb782c':
remove old fashioned Dream, no longer supported
Scott Main [Thu, 18 Oct 2012 21:39:59 +0000 (14:39 -0700)]
Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev
Sascha Haeberling [Thu, 18 Oct 2012 07:36:02 +0000 (00:36 -0700)]
First cut at a skeleton for the TinyPlanets filter.
Bug:
7344426
This is not hooking up the real algorithm yet, but unblocks Doris so she
can add the button while we rewrite the algorithm.
Change-Id: I685b6c189e8ac124670db53c37565c4f1ff1f606
Doris Liu [Thu, 18 Oct 2012 20:36:50 +0000 (13:36 -0700)]
am
95a9eebf: am
6b370a9d: am
7b474a2a: am
08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches
* commit '
95a9eebfd4692da0606950a658a2a2421e768631':
Fix for initial edited picture is gray
Doris Liu [Thu, 18 Oct 2012 20:34:58 +0000 (13:34 -0700)]
am
6b370a9d: am
7b474a2a: am
08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches
* commit '
6b370a9d4f7ab98ade985b7d81944dd3e45da941':
Fix for initial edited picture is gray
Doris Liu [Thu, 18 Oct 2012 20:33:09 +0000 (13:33 -0700)]
am
7b474a2a: am
08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches
* commit '
7b474a2ab38789e1f80ce60a62b4752c2a3cfe0b':
Fix for initial edited picture is gray
Doris Liu [Thu, 18 Oct 2012 20:30:34 +0000 (13:30 -0700)]
am
08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches
* commit '
08e6b8650dfb11e282cca22da71750bcb2e5e478':
Fix for initial edited picture is gray
Doris Liu [Thu, 18 Oct 2012 20:28:17 +0000 (13:28 -0700)]
Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches
Doris Liu [Thu, 18 Oct 2012 20:22:40 +0000 (13:22 -0700)]
Fix for initial edited picture is gray
Bug:
7373880
Change-Id: I0aa18ba850608437ae6327b3f3d676b218bcc75e
Ruben Brunk [Thu, 18 Oct 2012 20:12:21 +0000 (13:12 -0700)]
am
06927dbd: am
1901df72: am
bc1091bf: am
eb4a9359: Fixed initial aspect button text.
* commit '
06927dbd98404d878fca166237149bba300261d5':
Fixed initial aspect button text.
Ruben Brunk [Thu, 18 Oct 2012 20:09:50 +0000 (13:09 -0700)]
am
1901df72: am
bc1091bf: am
eb4a9359: Fixed initial aspect button text.
* commit '
1901df726282fe0bf773b6e486c3d494d4f57356':
Fixed initial aspect button text.
Ruben Brunk [Thu, 18 Oct 2012 20:07:59 +0000 (13:07 -0700)]
am
bc1091bf: am
eb4a9359: Fixed initial aspect button text.
* commit '
bc1091bffc812117d360746fae240032bcbad531':
Fixed initial aspect button text.
Ruben Brunk [Thu, 18 Oct 2012 20:06:19 +0000 (13:06 -0700)]
am
eb4a9359: Fixed initial aspect button text.
* commit '
eb4a9359eaf8a717d6bda5df3d1831cf8f547423':
Fixed initial aspect button text.
Ruben Brunk [Thu, 18 Oct 2012 19:46:28 +0000 (12:46 -0700)]
Fixed initial aspect button text.
Bug:
7374910
Change-Id: I2c86b7c5b242f930692e2e6feda8a85533c509d8
Scott Main [Thu, 18 Oct 2012 18:59:47 +0000 (11:59 -0700)]
remove old fashioned Dream, no longer supported
Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8
Jason Noguchi [Thu, 18 Oct 2012 18:18:29 +0000 (11:18 -0700)]
am
aba4eaf1: am
81db4a76: am
7ad1b755: am
ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches
* commit '
aba4eaf111a74c4a6daea3ab74175062519864c8':
Adding accessor methods for camera latency vars.
Jason Noguchi [Thu, 18 Oct 2012 18:16:27 +0000 (11:16 -0700)]
am
81db4a76: am
7ad1b755: am
ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches
* commit '
81db4a76babdd51c13977683c28194d6d538fe5e':
Adding accessor methods for camera latency vars.
Jason Noguchi [Thu, 18 Oct 2012 18:14:22 +0000 (11:14 -0700)]
am
7ad1b755: am
ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches
* commit '
7ad1b755720eb9f699b0074397841c32a6148790':
Adding accessor methods for camera latency vars.
Jason Noguchi [Thu, 18 Oct 2012 18:12:35 +0000 (11:12 -0700)]
am
ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches
* commit '
ed22e4362ace6b031d826493cf9caea3a2c16a96':
Adding accessor methods for camera latency vars.
Jason Noguchi [Thu, 18 Oct 2012 18:10:35 +0000 (11:10 -0700)]
Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches
Baligh Uddin [Thu, 18 Oct 2012 06:22:47 +0000 (23:22 -0700)]
am
2fd5b635: (-s ours) am
48f9547b: am
ab81203d: am
12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
2fd5b635586cf31515345aece977e7082b488bf0':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Oct 2012 06:20:51 +0000 (23:20 -0700)]
am
48f9547b: am
ab81203d: am
12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
48f9547b001586234a783a5d4bf67681d1fc78be':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Oct 2012 06:20:14 +0000 (23:20 -0700)]
am
47888156: (-s ours) am
5463d379: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
478881563d3c4573dd450d5b56617dab06515fe6':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Oct 2012 06:18:56 +0000 (23:18 -0700)]
am
ab81203d: am
12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
ab81203d5682d74fff8e8921c3a61783bf8af3ce':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Oct 2012 06:17:20 +0000 (23:17 -0700)]
am
5463d379: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
5463d3795077c4554e6af5bf6a32393710dd3061':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Oct 2012 06:16:50 +0000 (23:16 -0700)]
am
12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
12a6e773a9d35e425ddfaeaa29d68221b6c9d14e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Oct 2012 06:16:47 +0000 (23:16 -0700)]
am
2ac309ad: (-s ours) am
1c43f09d: am
6e64dcff: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
2ac309ade479a22aaaad0f7319850357dc85a603':
Import translations. DO NOT MERGE