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

George Mount [Mon, 5 Nov 2012 23:42:48 +0000 (15:42 -0800)]

am 1cb1d863: am 39f548a5: am b69af65f: am 0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches

* commit '1cb1d863456f025e85e56f5b01654a01abd66ee3':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:42:47 +0000 (15:42 -0800)]

am 3e8cd499: am e6e10e32: am f52d90a1: am 60d25279: Handle screen rotation

* commit '3e8cd49920e1bbb49fcea6b4e0fc3f86504b72ee':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:42:45 +0000 (15:42 -0800)]

am 1084e8c5: am a15b5195: am 99679734: am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches

* commit '1084e8c5baacf91eff4aa85b59d73d9ccfd993ca':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:42:44 +0000 (15:42 -0800)]

am e089d77a: am 5206cc56: am ff5061c8: am 4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches

* commit 'e089d77aa828a4d69ea97c4f185cd4dee0781ae5':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:42:43 +0000 (15:42 -0800)]

am d17aac48: am 3234d83c: am 255dad6d: am 0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches

* commit 'd17aac48699438d2270ed7e9405b0e0106c7c315':

commit | commitdiff | tree

Sascha Haeberling [Mon, 5 Nov 2012 23:42:42 +0000 (15:42 -0800)]

am a33c2934: am 8bbc73f4: am e3106a8c: am 2576a29c: First cut at a skeleton for the TinyPlanets filter.

* commit 'a33c2934e79778d921da2bcb923a4a9f7787c019':

commit | commitdiff | tree

Scott Main [Mon, 5 Nov 2012 23:42:40 +0000 (15:42 -0800)]

am 38cd169c: am 28c4d6bb: am aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev

* commit '38cd169ca5fab55ae21c400824ce42076816c6e3':

commit | commitdiff | tree

Doris Liu [Mon, 5 Nov 2012 23:42:39 +0000 (15:42 -0800)]

am 72d55ee5: am d69d5b63: am 7b474a2a: am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches

* commit '72d55ee5b46939cc7cd3c3ffc9f6c47cbd64894f':

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:42:38 +0000 (15:42 -0800)]

am f38d2d2b: am 4adc279a: am bc1091bf: am eb4a9359: Fixed initial aspect button text.

* commit 'f38d2d2b14f63fb5cbbe7754dc7c4da43652327c':

commit | commitdiff | tree

Jason Noguchi [Mon, 5 Nov 2012 23:42:37 +0000 (15:42 -0800)]

am 2e31c132: am 7218147e: am 7ad1b755: am ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches

* commit '2e31c132db30d0dd23f4ea31e64b86589342a70a':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:42:36 +0000 (15:42 -0800)]

am d94b8927: am 2709de53: am ab81203d: (-s ours) am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit 'd94b89274fe65de03bb18da9303bc759bfca55ed':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:42:35 +0000 (15:42 -0800)]

am 0aab175e: am 19460c5e: (-s ours) am 6e64dcff: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '0aab175e66e0ee29128c5c6c86931b65fea7c21b':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:40:03 +0000 (15:40 -0800)]

am f8422e75: am 8cd8a93e: am cc70347d: am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches

* commit 'f8422e7526132ee17513dede6403f1aee0227406':

commit | commitdiff | tree

Doris Liu [Mon, 5 Nov 2012 23:40:02 +0000 (15:40 -0800)]

am 7f7efb90: am 1febb98e: am 637a7f1b: am 0addfc7f: Save edited picasa to "Edited Online Photos" album

* commit '7f7efb9080cb6739ec9d27ffee78a29359115132':

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:40:01 +0000 (15:40 -0800)]

am d0d21405: am be7c16de: am 5d596558: am ef8597fe: Fixed disappearing aspect ratio button.

* commit 'd0d21405f3d317f06afc0f6584a7184482459a73':

commit | commitdiff | tree

Doris Liu [Mon, 5 Nov 2012 23:40:00 +0000 (15:40 -0800)]

am e78b1def: am 1fd563a6: am 04114762: am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches

* commit 'e78b1defccc3f2b2a8d9cd2cbaef0747171c9a1a':

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:39:58 +0000 (15:39 -0800)]

am 0f7814ae: 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 '0f7814ae4c5f53eb365c2707f09845ff2a14561a':

commit | commitdiff | tree

John Hoford [Mon, 5 Nov 2012 23:39:57 +0000 (15:39 -0800)]

am cb13a19a: am 5acccefe: am e12e6962: am da974d84: fix crash from configurable slider ranges

* commit 'cb13a19a6cab25e318508dc6651ddf8c77453776':

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:39:56 +0000 (15:39 -0800)]

am 745448f4: am d0b53c08: am 1056ce1a: am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things.

* commit '745448f4683d79c6b06ff9b87054e324a05ec897':

commit | commitdiff | tree

John Hoford [Mon, 5 Nov 2012 23:39:55 +0000 (15:39 -0800)]

am 02b56f9c: am 272546bb: am abe96287: am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches

* commit '02b56f9c75acd116adac8ec2489360df29b0f551':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:39:54 +0000 (15:39 -0800)]

am c5fe04b3: am 8e71835d: am 21c91bfb: am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches

* commit 'c5fe04b3ba9621b6a3246e3b5fab12a569db32a1':

commit | commitdiff | tree

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':

commit | commitdiff | tree

John Reck [Mon, 5 Nov 2012 23:39:53 +0000 (15:39 -0800)]

am 8bb40f38: am d6d9db90: am d07026bf: am 57731ee2: Only fade out if texture creation succeeded

* commit '8bb40f38b3bd152bc246cd42133ebeb56529f920':

commit | commitdiff | tree

Mangesh Ghiware [Mon, 5 Nov 2012 23:39:52 +0000 (15:39 -0800)]

am 38af3351: am c2c0b1b6: am 07c2c448: am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches

* commit '38af335187bb53a746ddabbad801f8c2f6caaa61':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:39:51 +0000 (15:39 -0800)]

am e6e10e32: am f52d90a1: am 60d25279: Handle screen rotation

* commit 'e6e10e3286724adfe24c7783ba12cfe761e36e22':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:39:51 +0000 (15:39 -0800)]

am 2e9229ae: am d0ff9e6b: am 72b0fbef: (-s ours) am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '2e9229ae7927e8bea0d5b5a4e5f1a82021ca7c2b':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:39:50 +0000 (15:39 -0800)]

am 6e657227: am f71589e4: (-s ours) am 55ec71e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '6e6572275c4b810281fe261545f8c3b48cf73568':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:39:39 +0000 (15:39 -0800)]

am 4adc279a: am bc1091bf: am eb4a9359: Fixed initial aspect button text.

* commit '4adc279a57e3d2436b6861eee760f37a8df2aab9':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

The Android Open Source Project [Mon, 5 Nov 2012 22:21:29 +0000 (14:21 -0800)]

Reconcile with jb-mr1-release - do not merge

Change-Id: I2e4981ca363238eaffef17b801ee9f48ce68d7a4

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 22:15:15 +0000 (14:15 -0800)]

am 2f0d749f: am 954afb2e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 00:50:29 +0000 (16:50 -0800)]

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

commit | commitdiff | tree

The Android Automerger [Sat, 3 Nov 2012 00:34:46 +0000 (17:34 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

Bart Sears [Fri, 2 Nov 2012 22:40:23 +0000 (15:40 -0700)]

am 2ea267c5: am 70fb3773: am b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches

* commit '2ea267c52346e41c8431f398b0b5de5ecb0a12b2':
Lock icon in secure album should redirect to gallery after unlock.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Open Source Project [Fri, 2 Nov 2012 14:29:45 +0000 (07:29 -0700)]

Reconcile with jb-mr1-release - do not merge

Change-Id: I7f86b6b8a1da7f99d90a50f5ddd17b16b3f68f75

commit | commitdiff | tree

Baligh Uddin [Fri, 2 Nov 2012 14:26:39 +0000 (07:26 -0700)]

am 144b3ae0: am f350beb8: am 3252800c: (-s ours) Import translations. DO NOT MERGE

* commit '144b3ae0d3db4af15c39623412720cb060a8c0aa':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 2 Nov 2012 14:24:10 +0000 (07:24 -0700)]

am c7de1cf2: Import translations. DO NOT MERGE

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Automerger [Fri, 2 Nov 2012 02:05:35 +0000 (19:05 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

George Mount [Thu, 1 Nov 2012 20:44:33 +0000 (13:44 -0700)]

am e016c948: am bd52f5e7: am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches

* commit 'e016c9488a36fabb1840906055654156bc7ee9ac':
Fix extra gray item in secure album.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Bart Sears [Thu, 1 Nov 2012 20:04:06 +0000 (13:04 -0700)]

am ffb98755: am 77262bd5: am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches

* commit 'ffb987554d8817b63c717deba450d4997ee47524':
Jump to lockscreen in secure album if tap on video

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sascha Haeberling [Thu, 1 Nov 2012 19:59:35 +0000 (12:59 -0700)]

am 3084fd8f: am 452ce867: am 769d38db: Fix tiny planet not using XMP metadata anymore

* commit '3084fd8f724d367c6b747babdf7ee11394b958fa':
Fix tiny planet not using XMP metadata anymore

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Open Source Project [Thu, 1 Nov 2012 14:52:26 +0000 (07:52 -0700)]

Reconcile with jb-mr1-release - do not merge

Change-Id: I996e6bea19513302d3d40c861c364c40f84f580b

commit | commitdiff | tree

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

commit | commitdiff | tree

The Android Automerger [Thu, 1 Nov 2012 01:34:16 +0000 (18:34 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Wed, 31 Oct 2012 22:05:00 +0000 (15:05 -0700)]

am 13193c12: am 8405f65e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '13193c12856d2ddb8caa78fd0f9772cb8fed7b4c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 31 Oct 2012 22:04:58 +0000 (15:04 -0700)]

am 278e1637: am f09fa2bf: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '278e1637068e4ccbee348a67abb974cfa2c792a9':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Wed, 31 Oct 2012 22:00:49 +0000 (15:00 -0700)]

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

commit | commitdiff | tree

Baligh Uddin [Wed, 31 Oct 2012 21:59:28 +0000 (14:59 -0700)]

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

commit | commitdiff | tree

Baligh Uddin [Wed, 31 Oct 2012 16:45:58 +0000 (09:45 -0700)]

am 5bbb9620: am 692a8536: am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '5bbb9620aa8fcc67854f28e39fe8a10d226a2f76':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 31 Oct 2012 16:43:39 +0000 (09:43 -0700)]

am 692a8536: am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '692a8536b790d50c506a7fb9588301eaff5e02c6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 31 Oct 2012 16:42:05 +0000 (09:42 -0700)]

am 96223557: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '9622355760418d63c42ef71f7998c0d5d49689e7':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 31 Oct 2012 16:41:08 +0000 (09:41 -0700)]

am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '262c7bd76f21d440f2da3a4118c432987fcb8cdd':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 31 Oct 2012 16:39:55 +0000 (09:39 -0700)]

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

commit | commitdiff | tree

Baligh Uddin [Wed, 31 Oct 2012 16:39:23 +0000 (09:39 -0700)]

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

commit | commitdiff | tree

Baligh Uddin [Wed, 31 Oct 2012 16:22:28 +0000 (09:22 -0700)]

am 3106efc4: am a65e41a8: am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '3106efc409d7a1e9c73e795fcd85e92e72246fe2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 31 Oct 2012 16:20:54 +0000 (09:20 -0700)]

am 04fb5ac3: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '04fb5ac38a29eb22783dbc074977512014f06af4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 31 Oct 2012 16:19:47 +0000 (09:19 -0700)]

am a65e41a8: am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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