OSDN Git Service
nicolasroard [Mon, 5 Nov 2012 23:48:52 +0000 (15:48 -0800)]
am
4626ebd1: am
0b44017c: am
361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
* commit '
4626ebd1e289777868f33abb5e0b3a4bc116961e':
Bobby Georgescu [Mon, 5 Nov 2012 23:48:51 +0000 (15:48 -0800)]
am
75a448eb: am
f30096b4: am
c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
* commit '
75a448eb193308f6b9268968265895c019ae3ab2':
nicolasroard [Mon, 5 Nov 2012 23:48:50 +0000 (15:48 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:48:48 +0000 (15:48 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:48:47 +0000 (15:48 -0800)]
am
cd35c2fc: am
488547b0: am
2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches
* commit '
cd35c2fc673f455de2d5853ecf1248d8ff167742':
George Mount [Mon, 5 Nov 2012 23:48:46 +0000 (15:48 -0800)]
am
b2fb154f: am
3bfbae1d: am
24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches
* commit '
b2fb154fa84ec663bb8e181c299a3868e9ee98aa':
Baligh Uddin [Mon, 5 Nov 2012 23:48:44 +0000 (15:48 -0800)]
am
0f40db8d: am
306176fb: (-s ours) am
7c08064b: (-s ours) Import translations. DO NOT MERGE
* commit '
0f40db8d736ab95f0a3c9b03c9b20f5bd85a34f1':
Baligh Uddin [Mon, 5 Nov 2012 23:48:43 +0000 (15:48 -0800)]
am
e6319953: am
caace51d: (-s ours) Import translations. DO NOT MERGE
* commit '
e6319953a3b2d11251b57bfb6cd2a5e0ffbb552d':
Baligh Uddin [Mon, 5 Nov 2012 23:48:41 +0000 (15:48 -0800)]
am
69cec707: (-s ours) Import translations. DO NOT MERGE
* commit '
69cec707836ae8c072da9e0015160b96a5c5c6be':
Import translations. DO NOT MERGE
John Hoford [Mon, 5 Nov 2012 23:45:00 +0000 (15:45 -0800)]
am
57900769: am
ea7366a5: am
5fbfe6f1: on entry check if Tiny Planet if not remove UI
* commit '
5790076999dfcd7d8cadb7ce616968a4954a5cc4':
Mangesh Ghiware [Mon, 5 Nov 2012 23:44:58 +0000 (15:44 -0800)]
am
f7c1c580: am
4a138a84: am
63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches
* commit '
f7c1c580996c0fd874811871b9ca202cb191b674':
Bobby Georgescu [Mon, 5 Nov 2012 23:44:56 +0000 (15:44 -0800)]
am
6377a7e8: am
0df51da9: am
afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches
* commit '
6377a7e8d36a60e0fe5be9854f0112ab5b654e01':
Doris Liu [Mon, 5 Nov 2012 23:44:55 +0000 (15:44 -0800)]
am
574be81d: am
7ad3eb28: am
3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches
* commit '
574be81d8b20df74f827bb4a1fba9b969a251102':
Hung-ying Tyan [Mon, 5 Nov 2012 23:44:53 +0000 (15:44 -0800)]
am
c09daea1: am
23cfddb4: am
bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
* commit '
c09daea126a7f1d609908883958963a99d86e896':
John Reck [Mon, 5 Nov 2012 23:44:51 +0000 (15:44 -0800)]
am
38d29567: am
fdfced2d: am
ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
* commit '
38d295679f6f81313d1e2ec8d4f765255467f267':
Bobby Georgescu [Mon, 5 Nov 2012 23:44:50 +0000 (15:44 -0800)]
am
20a91815: am
b21c127c: am
e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches
* commit '
20a91815828f7f0a98eb4b577eb9c618b870b1d0':
Ruben Brunk [Mon, 5 Nov 2012 23:44:48 +0000 (15:44 -0800)]
am
6d9a6ff8: am
91814c2e: am
168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
* commit '
6d9a6ff8ed24be732f98cb83180f951e871f98dd':
Baligh Uddin [Mon, 5 Nov 2012 23:44:46 +0000 (15:44 -0800)]
am
b2993d29: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
b2993d29a712533610d7c4b39b31ad74f0d76c68':
Import translations. DO NOT MERGE
Bobby Georgescu [Mon, 5 Nov 2012 23:43:11 +0000 (15:43 -0800)]
am
1b73272f: am
cfbbe15d: am
3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches
* commit '
1b73272f029c89541ad5e230865b50bf4532876a':
George Mount [Mon, 5 Nov 2012 23:43:10 +0000 (15:43 -0800)]
am
d5d4246f: am
f2272574: am
58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
* commit '
d5d4246ffcbdfdf491846b1a314fb59064e2f4b4':
Baligh Uddin [Mon, 5 Nov 2012 23:43:08 +0000 (15:43 -0800)]
am
541b5568: am
1d25a687: (-s ours) am
73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
541b5568552c09077b562a284c3b7d24549b2ea2':
Baligh Uddin [Mon, 5 Nov 2012 23:43:07 +0000 (15:43 -0800)]
am
e2dd5119: (-s ours) am
2ed15703: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
e2dd511925056b11ab12b782e9e80a6a4038f042':
Bobby Georgescu [Mon, 5 Nov 2012 23:40:37 +0000 (15:40 -0800)]
am
e7e4f11e: am
34347598: am
1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches
* commit '
e7e4f11e28420cc6eb673505e63d57a6467efed3':
Ruben Brunk [Mon, 5 Nov 2012 23:40:36 +0000 (15:40 -0800)]
am
82a7226c: am
85930f99: am
0a32b7af: Fix to ensure visible history adapter strings are from xml.
* commit '
82a7226cd5345c9397302e4951c238d95a5bc35a':
nicolasroard [Mon, 5 Nov 2012 23:40:34 +0000 (15:40 -0800)]
am
2d61ca92: am
cd801412: am
51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches
* commit '
2d61ca92facb2120b04f589f6a40e7f15e1b6b06':
Bobby Georgescu [Mon, 5 Nov 2012 23:40:33 +0000 (15:40 -0800)]
am
8374ab71: am
b96be14e: am
e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches
* commit '
8374ab719341ce2a1939ebac5322360f008cedbb':
nicolasroard [Mon, 5 Nov 2012 23:40:31 +0000 (15:40 -0800)]
am
7741a8e0: am
e4614408: am
c778aab1: Prevent unveil direction to change as long as no touch up
* commit '
7741a8e07869d9eb9677fa683f0f913ccd84ecf9':
nicolasroard [Mon, 5 Nov 2012 23:40:30 +0000 (15:40 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:40:28 +0000 (15:40 -0800)]
am
4e612a39: am
2f4ec4f1: am
104165f1: Fix several issues with crop/straighten
* commit '
4e612a39112808a7978e4c0b21a66fba9091d772':
nicolasroard [Mon, 5 Nov 2012 23:40:27 +0000 (15:40 -0800)]
am
1684248c: am
afc8c49f: am
4d276f33: Only translate the main panel if we have to.
* commit '
1684248c622f35ba486be58ba8c49919c194b6b4':
nicolasroard [Mon, 5 Nov 2012 23:40:22 +0000 (15:40 -0800)]
am
25c35df0: am
b1b1b8f0: am
267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
* commit '
25c35df06354db9e6a5ff7cacbfa1d967eecb9c1':
Doris Liu [Mon, 5 Nov 2012 23:40:20 +0000 (15:40 -0800)]
Sascha Haeberling [Mon, 5 Nov 2012 23:40:19 +0000 (15:40 -0800)]
am
3f8990b6: am
a4c85fc1: am
2f879102: Adds a tiny planet (stereographic projection) image filter.
* commit '
3f8990b60d4fb858aecdc0039df26ea11bb5152b':
John Hoford [Mon, 5 Nov 2012 23:40:17 +0000 (15:40 -0800)]
am
172b1b6f: am
e6f7fe76: am
e9c55b28: Add the infrastructure to support Tiny Planet
* commit '
172b1b6f58ef3a727ef2c4ed34cb2e7c0005fe30':
Bobby Georgescu [Mon, 5 Nov 2012 23:40:16 +0000 (15:40 -0800)]
am
c908d79e: am
0def633f: am
41b3cff6: Fix delete and undo behavior on filmstrip
* commit '
c908d79e8a6b4826ba71830fe8f545c57f8942bb':
nicolasroard [Mon, 5 Nov 2012 23:40:14 +0000 (15:40 -0800)]
am
4ff1732d: am
be532361: am
3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches
* commit '
4ff1732d2d0766a139e4a105cfaad6874982ad8a':
George Mount [Mon, 5 Nov 2012 23:40:13 +0000 (15:40 -0800)]
am
1b5a21d2: am
6e806709: am
4dd4d80a: Remove progress bar when switching to grid mode.
* commit '
1b5a21d2286d50f1da3a3df0f40c1144c5778882':
Bobby Georgescu [Mon, 5 Nov 2012 23:40:11 +0000 (15:40 -0800)]
am
23d7dd46: am
ddb30c54: am
4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches
* commit '
23d7dd46aff419f0994840c6a085cc089969b5d7':
Mangesh Ghiware [Mon, 5 Nov 2012 23:40:10 +0000 (15:40 -0800)]
Ruben Brunk [Mon, 5 Nov 2012 23:40:08 +0000 (15:40 -0800)]
am
c6381a2a: am
91491889: am
b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
* commit '
c6381a2a6ccf0bb7fba7fa44a1e7786c20f709dd':
Bobby Georgescu [Mon, 5 Nov 2012 23:40:07 +0000 (15:40 -0800)]
am
239bc478: am
5ae82e1e: am
08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches
* commit '
239bc478a7dfa9343eb8b2547fb54172f50e72aa':
Mangesh Ghiware [Mon, 5 Nov 2012 23:40:05 +0000 (15:40 -0800)]
am
5e1709a2: am
f795b403: am
b037754e: Fix sharing state in Gallery ActionBar
* commit '
5e1709a237e08cf12e0335796ed17ecb24d5a632':
nicolasroard [Mon, 5 Nov 2012 23:40:04 +0000 (15:40 -0800)]
Doris Liu [Mon, 5 Nov 2012 23:40:02 +0000 (15:40 -0800)]
am
a175392c: am
c0ecc707: am
4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
* commit '
a175392c7073819ee6711099d6ce6aa40167b8dd':
Bobby Georgescu [Mon, 5 Nov 2012 23:40:01 +0000 (15:40 -0800)]
am
52e44d24: am
51283054: am
b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches
* commit '
52e44d249893969910b241aded0f9796d5dfa03d':
Scott Main [Mon, 5 Nov 2012 23:39:59 +0000 (15:39 -0800)]
am
b07da381: am
44adb1ee: (-s ours) am
9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
* commit '
b07da3812737997ecec4c4a980411b6a8d88caff':
Bobby Georgescu [Mon, 5 Nov 2012 23:39:58 +0000 (15:39 -0800)]
am
5fd5a8be: am
856ec7e5: am
79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
* commit '
5fd5a8be5f387466f2ffc1b89b2356ea2a9bdff1':
John Reck [Mon, 5 Nov 2012 23:39:56 +0000 (15:39 -0800)]
am
d2f8bc06: am
5415b4cb: am
014a111f: Save XMP & Exif data on edited photos
* commit '
d2f8bc069269542936f0e21595081093b86fa474':
nicolasroard [Mon, 5 Nov 2012 23:39:54 +0000 (15:39 -0800)]
am
1bde451f: am
8f6e1dc3: am
d7899c56: Fix undo/redo/back button behaviour with effects and enable history
* commit '
1bde451f817f716c7091b36dc92f714b69c5b363':
George Mount [Mon, 5 Nov 2012 23:39:53 +0000 (15:39 -0800)]
am
39f548a5: am
b69af65f: am
0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches
* commit '
39f548a5e9764afa105af687e4db15ed8b7c47cd':
nicolasroard [Mon, 5 Nov 2012 23:39:51 +0000 (15:39 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:39:50 +0000 (15:39 -0800)]
am
a15b5195: am
99679734: am
c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches
* commit '
a15b51954535b1f2320a577c0a72c676775f4208':
nicolasroard [Mon, 5 Nov 2012 23:39:48 +0000 (15:39 -0800)]
am
5206cc56: am
ff5061c8: am
4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches
* commit '
5206cc568e7b7122a7b7c18ba117d19427ba0671':
Bobby Georgescu [Mon, 5 Nov 2012 23:39:47 +0000 (15:39 -0800)]
am
3234d83c: am
255dad6d: am
0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches
* commit '
3234d83c379cd65e626adb84a917bb73cb37c6a1':
Sascha Haeberling [Mon, 5 Nov 2012 23:39:45 +0000 (15:39 -0800)]
am
8bbc73f4: am
e3106a8c: am
2576a29c: First cut at a skeleton for the TinyPlanets filter.
* commit '
8bbc73f4cf2d29e101e9570a11cd1604460f31ac':
Scott Main [Mon, 5 Nov 2012 23:39:43 +0000 (15:39 -0800)]
am
28c4d6bb: am
aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev
* commit '
28c4d6bbded4b2702368cc78340e4136d0878525':
Doris Liu [Mon, 5 Nov 2012 23:39:41 +0000 (15:39 -0800)]
am
d69d5b63: am
7b474a2a: am
08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches
* commit '
d69d5b639570688122c847898943b1a1bbfa43f0':
Ruben Brunk [Mon, 5 Nov 2012 23:39:39 +0000 (15:39 -0800)]
Jason Noguchi [Mon, 5 Nov 2012 23:39:37 +0000 (15:39 -0800)]
am
7218147e: am
7ad1b755: am
ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches
* commit '
7218147e6d81315245e3a485fb954761af687b2f':
Baligh Uddin [Mon, 5 Nov 2012 23:39:35 +0000 (15:39 -0800)]
am
2709de53: am
ab81203d: (-s ours) am
12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
2709de537dd57a1ac329b35fc29a165aa1e2ae16':
Baligh Uddin [Mon, 5 Nov 2012 23:39:34 +0000 (15:39 -0800)]
am
19460c5e: (-s ours) am
6e64dcff: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
19460c5e8d1bfbdb43c0ec32e05a57458e5561ab':
Bobby Georgescu [Mon, 5 Nov 2012 23:38:02 +0000 (15:38 -0800)]
am
8cd8a93e: am
cc70347d: am
737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches
* commit '
8cd8a93eae3158f8469026f65e7d31819ae38fab':
Doris Liu [Mon, 5 Nov 2012 23:38:01 +0000 (15:38 -0800)]
am
1febb98e: am
637a7f1b: am
0addfc7f: Save edited picasa to "Edited Online Photos" album
* commit '
1febb98e498f425935cfafdb492283b42ef61c87':
Ruben Brunk [Mon, 5 Nov 2012 23:37:59 +0000 (15:37 -0800)]
am
be7c16de: am
5d596558: am
ef8597fe: Fixed disappearing aspect ratio button.
* commit '
be7c16de9647b449ed417ae16315b47aaa143a83':
Doris Liu [Mon, 5 Nov 2012 23:37:58 +0000 (15:37 -0800)]
am
1fd563a6: am
04114762: am
6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches
* commit '
1fd563a6bc183f573f7f44de5aaa55a4fbc1dbb7':
Ruben Brunk [Mon, 5 Nov 2012 23:37:56 +0000 (15:37 -0800)]
am
80e62189: am
193c3f0c: am
3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches
* commit '
80e6218918b508f6147c8cc9699df8d338e50a95':
John Hoford [Mon, 5 Nov 2012 23:37:54 +0000 (15:37 -0800)]
am
5acccefe: am
e12e6962: am
da974d84: fix crash from configurable slider ranges
* commit '
5acccefeadeff7ff09683b165ac1516d733bf75b':
Ruben Brunk [Mon, 5 Nov 2012 23:37:53 +0000 (15:37 -0800)]
am
d0b53c08: am
1056ce1a: am
43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things.
* commit '
d0b53c08d88a696170989d6c0c72f8cbb26ac654':
John Hoford [Mon, 5 Nov 2012 23:37:51 +0000 (15:37 -0800)]
am
272546bb: am
abe96287: am
de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches
* commit '
272546bbbfa29cc0fd273003a071e735631a4766':
nicolasroard [Mon, 5 Nov 2012 23:37:50 +0000 (15:37 -0800)]
am
8e71835d: am
21c91bfb: am
ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches
* commit '
8e71835d2d34e33a1622fbf66308fc0ccfc6f876':
John Reck [Mon, 5 Nov 2012 23:37:48 +0000 (15:37 -0800)]
am
d6d9db90: am
d07026bf: am
57731ee2: Only fade out if texture creation succeeded
* commit '
d6d9db90be8b088f80c2023c69fbdc0f9e75b816':
Mangesh Ghiware [Mon, 5 Nov 2012 23:37:46 +0000 (15:37 -0800)]
am
c2c0b1b6: am
07c2c448: am
4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches
* commit '
c2c0b1b623a2091d052362e213d7e8e81a772463':
Baligh Uddin [Mon, 5 Nov 2012 23:37:45 +0000 (15:37 -0800)]
am
d0ff9e6b: am
72b0fbef: (-s ours) am
77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
d0ff9e6b30fb44a0a9c1984a611703751d682a31':
Baligh Uddin [Mon, 5 Nov 2012 23:37:43 +0000 (15:37 -0800)]
am
f71589e4: (-s ours) am
55ec71e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
f71589e474392a62a41ab22da3bdd14d078611b8':
Baligh Uddin [Mon, 5 Nov 2012 22:11:50 +0000 (14:11 -0800)]
am
954afb2e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
954afb2e42b9894676f0e7f9fb9b22d5bcf8825c':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 5 Nov 2012 00:50:29 +0000 (16:50 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Bart Sears [Fri, 2 Nov 2012 22:38:09 +0000 (15:38 -0700)]
am
70fb3773: am
b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
* commit '
70fb3773116bacdce3807a6ddfe386b43f4bbe80':
Lock icon in secure album should redirect to gallery after unlock.
Bart Sears [Fri, 2 Nov 2012 22:36:33 +0000 (15:36 -0700)]
am
b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
* commit '
b41864f13b83a4f2d92f601b2e4381762ad1effa':
Lock icon in secure album should redirect to gallery after unlock.
Bart Sears [Fri, 2 Nov 2012 22:34:01 +0000 (15:34 -0700)]
Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
Baligh Uddin [Fri, 2 Nov 2012 14:24:09 +0000 (07:24 -0700)]
am
f350beb8: am
3252800c: (-s ours) Import translations. DO NOT MERGE
* commit '
f350beb8c64c38b959f27b9b917cdc58fe72868a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 2 Nov 2012 14:21:55 +0000 (07:21 -0700)]
am
3252800c: (-s ours) Import translations. DO NOT MERGE
* commit '
3252800c7fe6bdb69b066eae0db739d06cfec64d':
Import translations. DO NOT MERGE
Wu-cheng Li [Fri, 2 Nov 2012 05:36:07 +0000 (13:36 +0800)]
Lock icon in secure album should redirect to gallery after unlock.
Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up
when launching gallery.
bug:
7462572
Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0
Baligh Uddin [Fri, 2 Nov 2012 05:07:22 +0000 (22:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie49627da381e12e72468c31322d40bbc3915e7ec
Auto-generated-cl: translation import
Baligh Uddin [Fri, 2 Nov 2012 05:07:02 +0000 (22:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I981bbec359bbbf1414a78726bc55c20281ebda0f
Auto-generated-cl: translation import
Baligh Uddin [Fri, 2 Nov 2012 05:06:20 +0000 (22:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iee5cfc87f61245753889d1cc83f9c9a511449bbe
Auto-generated-cl: translation import
George Mount [Thu, 1 Nov 2012 20:42:08 +0000 (13:42 -0700)]
am
bd52f5e7: am
25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
* commit '
bd52f5e7f8e381b8e7f7d49cd88e5ba6cb46e8b2':
Fix extra gray item in secure album.
George Mount [Thu, 1 Nov 2012 20:39:45 +0000 (13:39 -0700)]
am
25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
* commit '
25fab8057e0db4b1ff33b8da13b270d9af8ae217':
Fix extra gray item in secure album.
George Mount [Thu, 1 Nov 2012 20:37:54 +0000 (13:37 -0700)]
Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
Bart Sears [Thu, 1 Nov 2012 20:02:01 +0000 (13:02 -0700)]
am
77262bd5: am
40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
* commit '
77262bd58f4aba9bdb961c7a9be856502e120fb8':
Jump to lockscreen in secure album if tap on video
Bart Sears [Thu, 1 Nov 2012 20:00:18 +0000 (13:00 -0700)]
am
40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
* commit '
40bb7158b8bda53433b36b94d6efed0e3937dcf2':
Jump to lockscreen in secure album if tap on video
Bart Sears [Thu, 1 Nov 2012 19:59:00 +0000 (12:59 -0700)]
Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
Sascha Haeberling [Thu, 1 Nov 2012 19:57:26 +0000 (12:57 -0700)]
am
452ce867: am
769d38db: Fix tiny planet not using XMP metadata anymore
* commit '
452ce867e9d5837ede2e67d75fdaf07fb8ffcd57':
Fix tiny planet not using XMP metadata anymore
Sascha Haeberling [Thu, 1 Nov 2012 19:54:07 +0000 (12:54 -0700)]
am
769d38db: Fix tiny planet not using XMP metadata anymore
* commit '
769d38db5736cd690ab7837c0824572739c39184':
Fix tiny planet not using XMP metadata anymore
George Mount [Thu, 1 Nov 2012 17:40:22 +0000 (10:40 -0700)]
Fix extra gray item in secure album.
Bug
7454444
Change-Id: I83f40e7e74f658a7b9ada148932a231ef8c31f73
Angus Kong [Thu, 1 Nov 2012 07:08:44 +0000 (15:08 +0800)]
Jump to lockscreen in secure album if tap on video
bug:
7454356
Change-Id: I1e7e9ed886d414d5b41abdb1cc1d00c7736ae006
Sascha Haeberling [Thu, 1 Nov 2012 00:21:02 +0000 (17:21 -0700)]
Fix tiny planet not using XMP metadata anymore
Bug:
7452777
Background: Semantics of isPanoramaSafe has changed and should not be
called from within the TinyPlanet filter at all.
Change-Id: I6bada525d30d9ff21fdff99f52c6697c3f828c7e
Baligh Uddin [Wed, 31 Oct 2012 22:01:43 +0000 (15:01 -0700)]
am
8405f65e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
8405f65e8b3a671562ea215b06ae91512a4734d7':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 22:01:41 +0000 (15:01 -0700)]
am
f09fa2bf: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
f09fa2bf45d92e0284212960d73080d825e39351':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 31 Oct 2012 22:00:49 +0000 (15:00 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 31 Oct 2012 21:59:28 +0000 (14:59 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev