OSDN Git Service
John Hoford [Fri, 11 Oct 2013 18:30:58 +0000 (11:30 -0700)]
am
b0f61454: Merge "fix RTL menu issues" into gb-ub-photos-carlsbad
* commit '
b0f614548813ecd1542745f35900856c05d70948':
fix RTL menu issues
John Hoford [Fri, 11 Oct 2013 18:28:33 +0000 (18:28 +0000)]
Merge "fix RTL menu issues" into gb-ub-photos-carlsbad
Alan Newberger [Fri, 11 Oct 2013 18:00:24 +0000 (11:00 -0700)]
am
c58ff057: Merge "Introduce FilterShowHelper for versioning visibility" into gb-ub-photos-carlsbad
* commit '
c58ff0578e2124f75b5a974ed821ee5766da2455':
Introduce FilterShowHelper for versioning visibility
Alan Newberger [Fri, 11 Oct 2013 17:59:07 +0000 (17:59 +0000)]
Merge "Introduce FilterShowHelper for versioning visibility" into gb-ub-photos-carlsbad
Mangesh Ghiware [Fri, 11 Oct 2013 17:57:09 +0000 (10:57 -0700)]
am
d180bb94: Use existing crop activity as fallback.
* commit '
d180bb94f9b9fc9846f08479fc952bb6f5fe70de':
Use existing crop activity as fallback.
Mangesh Ghiware [Fri, 11 Oct 2013 17:03:29 +0000 (10:03 -0700)]
Use existing crop activity as fallback.
Bug:
11156898
Change-Id: I77f4788870a4f3f499ba59e168f04922a95a03c4
John Hoford [Fri, 11 Oct 2013 17:08:22 +0000 (10:08 -0700)]
fix RTL menu issues
bug:
11184806
Change-Id: I4562b13afc34069ed72a7bf497825abdd57a00ba
Alan Newberger [Thu, 10 Oct 2013 21:17:58 +0000 (14:17 -0700)]
Introduce FilterShowHelper for versioning visibility
This CL creates FilterShowHelper which will first be used to ensure Versions is active.
Bug:
10734094
Change-Id: I7ac7d99af8818e2599ea2f2a0e64b9c3433a9002
nicolasroard [Fri, 11 Oct 2013 02:14:45 +0000 (19:14 -0700)]
am
b052e5c7: Use AOSP borders by default
* commit '
b052e5c72d27c3da585e345d758170c3ab26cbc8':
Use AOSP borders by default
nicolasroard [Fri, 11 Oct 2013 01:37:43 +0000 (18:37 -0700)]
Use AOSP borders by default
bug:
11132358
bug:
11130809
Change-Id: I57bcfeec35cde1095df5c26776aaa1a06cd110aa
nicolasroard [Fri, 11 Oct 2013 00:02:51 +0000 (17:02 -0700)]
am
1ebeed45: Fix edge case cache issues
* commit '
1ebeed45d206ed306eb149e4e63242b1b55558ef':
Fix edge case cache issues
nicolasroard [Thu, 10 Oct 2013 22:46:44 +0000 (15:46 -0700)]
Fix edge case cache issues
Also add additional debugging information.
bug:
10856175
Change-Id: Ie352e2dd6a86511abea97b622ed7c3b3cccd8479
John Hoford [Thu, 10 Oct 2013 16:53:34 +0000 (09:53 -0700)]
am
96e6ddb2: fix Gallery crashes with empty PTP device
* commit '
96e6ddb24dd149aa991ef007a394ea9592066d14':
fix Gallery crashes with empty PTP device
John Hoford [Thu, 10 Oct 2013 15:59:17 +0000 (08:59 -0700)]
fix Gallery crashes with empty PTP device
bug:
11152999
Change-Id: I70e4787dc46c0e948712ea4530b8110c36603dfa
John Hoford [Wed, 9 Oct 2013 22:32:12 +0000 (15:32 -0700)]
am
fb1884f6: Merge "hide popupmenu during rotate" into gb-ub-photos-carlsbad
* commit '
fb1884f63beb3ab4c94b09aea91b5ad501bc6af6':
hide popupmenu during rotate
John Hoford [Wed, 9 Oct 2013 22:30:02 +0000 (22:30 +0000)]
Merge "hide popupmenu during rotate" into gb-ub-photos-carlsbad
John Hoford [Wed, 9 Oct 2013 20:54:45 +0000 (13:54 -0700)]
hide popupmenu during rotate
bug:
11135309
Change-Id: I5954fafe1f081f8d1fc30c36f5cf6b2c66cb9511
Mangesh Ghiware [Wed, 9 Oct 2013 16:43:23 +0000 (09:43 -0700)]
am
9895d680: Build properties now updated to SDK level 19.
* commit '
9895d680e66d1f1cf4603fa91c8a53e328f1476b':
Build properties now updated to SDK level 19.
Mangesh Ghiware [Wed, 9 Oct 2013 16:36:24 +0000 (09:36 -0700)]
Build properties now updated to SDK level 19.
Check only for numeric version code.
Bug:
4225598
Change-Id: I632b1c2ceb310fc35804b6e44a43c6c4ce1562b1
nicolasroard [Wed, 9 Oct 2013 03:31:07 +0000 (20:31 -0700)]
am
4d385a0a: Add missing flag for bounds decode
* commit '
4d385a0aebbf9a6a319c3baf28fb95e808746559':
Add missing flag for bounds decode
nicolasroard [Wed, 9 Oct 2013 02:42:54 +0000 (19:42 -0700)]
Add missing flag for bounds decode
bug:
11140621
Change-Id: I08af1a6dd9527a03b21d7ab0c3cff776f37201ac
nicolasroard [Wed, 9 Oct 2013 02:24:34 +0000 (19:24 -0700)]
am
a164496b: Fix triple buffer update bug bug:
11140550
* commit '
a164496b6e2239d0bda9de027f10587687067135':
Fix triple buffer update bug bug:
11140550
nicolasroard [Wed, 9 Oct 2013 02:00:21 +0000 (19:00 -0700)]
Fix triple buffer update bug
bug:
11140550
Change-Id: I530bf8b071c7336eb7a20293d6c9c2f5360df47e
Mangesh Ghiware [Tue, 8 Oct 2013 23:11:01 +0000 (16:11 -0700)]
am
7943a83c: Fix incorrect usage of getComponentEnabledSetting()
* commit '
7943a83c2e2811fa427f99fd97e9a52832710d84':
Fix incorrect usage of getComponentEnabledSetting()
Ed Heyl [Tue, 8 Oct 2013 23:01:39 +0000 (16:01 -0700)]
merge in KFS78N (no-op)
Ed Heyl [Tue, 8 Oct 2013 22:42:41 +0000 (15:42 -0700)]
merge in KQS81M
Mangesh Ghiware [Tue, 8 Oct 2013 22:29:58 +0000 (15:29 -0700)]
Fix incorrect usage of getComponentEnabledSetting()
Bug:
10912503
Change-Id: I9835995d121445ca170668ae8150a24e95e27544
Baligh Uddin [Tue, 8 Oct 2013 03:51:11 +0000 (03:51 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Mangesh Ghiware [Tue, 8 Oct 2013 03:47:34 +0000 (20:47 -0700)]
am
58b6f484: On K+, intent out to Wallpaper manager for crop and set wallpaper.
* commit '
58b6f484263f57009e22fef482a9ae1a4d3f48b6':
On K+, intent out to Wallpaper manager for crop and set wallpaper.
Baligh Uddin [Tue, 8 Oct 2013 02:43:15 +0000 (19:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie008d4bba5a7748fd46828ddace3fd331ed1ea66
Auto-generated-cl: translation import
Mangesh Ghiware [Mon, 7 Oct 2013 22:51:54 +0000 (15:51 -0700)]
On K+, intent out to Wallpaper manager for crop and set wallpaper.
Bug:
4225598
Change-Id: Ib58a85775ebfd774356d26fd9aa01f2059916300
Svetoslav Ganov [Mon, 7 Oct 2013 18:33:38 +0000 (11:33 -0700)]
am
391e4a19: Switch Gallery2 to use the support lib for printing.
* commit '
391e4a190d4afcfdf89b8e7892e972cc998cdf41':
Switch Gallery2 to use the support lib for printing.
Svetoslav Ganov [Mon, 7 Oct 2013 03:03:32 +0000 (20:03 -0700)]
Switch Gallery2 to use the support lib for printing.
Now we have a class in the support library that uses a correct internal
implemetation based on the API level. On older devices the app does
not crash and on new devices it can print. Also this class does
the heavy lifiting. Gallery2 was not using this class, rather it had
its own (obsolete) implemetation that was not taking into account the
image aspect ratio to provide a hint to the print system for the
orientation to be used.
bug:
11099831
Change-Id: I4cd260614af4d9d87ec31d205ee2a5ef02ef5417
Baligh Uddin [Sat, 5 Oct 2013 03:45:02 +0000 (03:45 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Oct 2013 03:40:34 +0000 (03:40 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Oct 2013 02:33:26 +0000 (19:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I70be4c5ac4ad85f81cd79e88bcdeaae69a4fa3d7
Auto-generated-cl: translation import
Baligh Uddin [Sat, 5 Oct 2013 02:26:31 +0000 (19:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I873ad9456d393ba4a15db90a61e09dacb00b16d9
Auto-generated-cl: translation import
Mangesh Ghiware [Fri, 4 Oct 2013 22:19:44 +0000 (15:19 -0700)]
am
47f602c3: Revert "Disable GET_CONTENT intent-filter for KLP+"
* commit '
47f602c3262652f981a9c98358e5a8bde41656ea':
Revert "Disable GET_CONTENT intent-filter for KLP+"
Mangesh Ghiware [Fri, 4 Oct 2013 21:49:15 +0000 (21:49 +0000)]
Revert "Disable GET_CONTENT intent-filter for KLP+"
This reverts commit
a545774386d84dca5825b503c682a8eab272705c.
Bug:
11085255
Change-Id: I254e9cbaca074928d77851083418e4d0f692b13b
Mangesh Ghiware [Fri, 4 Oct 2013 18:03:40 +0000 (11:03 -0700)]
am
8bf525cb: Explicitly enable CameraLauncher
* commit '
8bf525cb49728310f1ca2bcda8c0a8355bde9785':
Explicitly enable CameraLauncher
Mangesh Ghiware [Fri, 4 Oct 2013 17:05:39 +0000 (10:05 -0700)]
am
13188768: Merge "Add methods to return Camera and Gallery launcher intents." into gb-ub-photos-carlsbad
* commit '
1318876872f434f07637c12f1f92bb7c3e1a92c8':
Add methods to return Camera and Gallery launcher intents.
Mangesh Ghiware [Tue, 24 Sep 2013 22:23:43 +0000 (15:23 -0700)]
Explicitly enable CameraLauncher
Bug:
10912503
Change-Id: Ic3370dd946bcc334de2758c0321ef5b187573ea3
Mangesh Ghiware [Fri, 4 Oct 2013 17:03:21 +0000 (17:03 +0000)]
Merge "Add methods to return Camera and Gallery launcher intents." into gb-ub-photos-carlsbad
Mangesh Ghiware [Fri, 4 Oct 2013 04:24:39 +0000 (21:24 -0700)]
am
a5457743: Disable GET_CONTENT intent-filter for KLP+
* commit '
a545774386d84dca5825b503c682a8eab272705c':
Disable GET_CONTENT intent-filter for KLP+
Mangesh Ghiware [Wed, 21 Aug 2013 21:00:34 +0000 (14:00 -0700)]
Disable GET_CONTENT intent-filter for KLP+
Bug:
10415790
Change-Id: I94260dbe7c61c1ead2a0e6ea12f837a76a69d547
Mangesh Ghiware [Thu, 3 Oct 2013 19:36:57 +0000 (12:36 -0700)]
Add methods to return Camera and Gallery launcher intents.
Bug:
10820027
Change-Id: I340072c48832e23245aa041503649b40cbaf0bf0
Baligh Uddin [Thu, 3 Oct 2013 00:32:47 +0000 (17:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id3acbd64ba78a1c5601cd40ebbc755cb4c82ae61
Auto-generated-cl: translation import
Baligh Uddin [Tue, 1 Oct 2013 04:35:14 +0000 (04:35 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 30 Sep 2013 21:55:48 +0000 (14:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id1dea03f926f4206fc01ba2f943601ae44d3fffe
Auto-generated-cl: translation import
Baligh Uddin [Mon, 30 Sep 2013 21:49:27 +0000 (14:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I560d28ed01a620d2ac3132c52e06980b6b03c8f0
Auto-generated-cl: translation import
Mangesh Ghiware [Fri, 27 Sep 2013 15:55:30 +0000 (08:55 -0700)]
am
06c02767: Rename Gallery activity and add trampoline
* commit '
06c027675948259368a902fd6f8c2ecac5db5167':
Rename Gallery activity and add trampoline
Mangesh Ghiware [Wed, 11 Sep 2013 22:59:59 +0000 (15:59 -0700)]
Rename Gallery activity and add trampoline
Bug:
10807861
Change-Id: Iaaf17b579db2fe09900e9817f766f43dd66dea61
John Hoford [Thu, 26 Sep 2013 21:52:13 +0000 (14:52 -0700)]
am
641be74b: enable change in printing
* commit '
641be74bd9d3f96d8665b23121f40efb8df2ea83':
enable change in printing
John Hoford [Thu, 26 Sep 2013 21:44:35 +0000 (14:44 -0700)]
enable change in printing
Change-Id: Ibf819002d29b83b4a8d72e7916d04f1c88a6bef2
John Hoford [Wed, 25 Sep 2013 23:06:02 +0000 (16:06 -0700)]
am
ef3cc52f: disable print on older system.
* commit '
ef3cc52f473f15534f00b61b55b53e93931fef97':
disable print on older system.
John Hoford [Wed, 25 Sep 2013 22:46:33 +0000 (15:46 -0700)]
disable print on older system.
Change-Id: I003aa965c885e6c7f65ade51b024bad400e8e458
John Hoford [Wed, 25 Sep 2013 21:07:58 +0000 (14:07 -0700)]
am
c0b8a86e: Merge "fix layout issues with border" into gb-ub-photos-carlsbad
* commit '
c0b8a86ec7cb9b54053ca5cb38716a73d1ba171c':
fix layout issues with border
John Hoford [Wed, 25 Sep 2013 21:06:18 +0000 (21:06 +0000)]
Merge "fix layout issues with border" into gb-ub-photos-carlsbad
Mindy Pereira [Wed, 25 Sep 2013 20:16:05 +0000 (13:16 -0700)]
am
75bfc8da: De-blue gallery
* commit '
75bfc8da0bc1e38144c782df0114def96f8534e8':
De-blue gallery
Baligh Uddin [Wed, 25 Sep 2013 19:59:36 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Mindy Pereira [Tue, 24 Sep 2013 16:08:06 +0000 (09:08 -0700)]
De-blue gallery
fixes b/
10914665 de-blue gallery
remaining issue was pressed state of images
Change-Id: Ib340d29867153925ae37da55d5c49cdb97f5d51b
Baligh Uddin [Wed, 25 Sep 2013 17:08:44 +0000 (10:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I988057d68d772903f4a4a209df86a08a03efcb5f
Auto-generated-cl: translation import
Baligh Uddin [Wed, 25 Sep 2013 17:07:01 +0000 (10:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icc67506d99bd48d59f37a7d903521c489b731be0
Auto-generated-cl: translation import
Kevin Gabayan [Wed, 25 Sep 2013 01:36:15 +0000 (18:36 -0700)]
am
6053762e: Merge "Remove unused assets in Gallery2." into gb-ub-photos-carlsbad
* commit '
6053762eb9686cf73a32311db46ba51ebcba8db8':
Remove unused assets in Gallery2.
Kevin Gabayan [Wed, 25 Sep 2013 01:34:17 +0000 (01:34 +0000)]
Merge "Remove unused assets in Gallery2." into gb-ub-photos-carlsbad
John Hoford [Tue, 24 Sep 2013 23:55:58 +0000 (16:55 -0700)]
fix layout issues with border
Change-Id: I92e7a86524a40f379eaa39af4b56500c33e97423
nicolasroard [Tue, 24 Sep 2013 23:48:28 +0000 (16:48 -0700)]
am
15152c9e: Merge "Fix color panel bgd color" into gb-ub-photos-carlsbad
* commit '
15152c9eec2a110e8ae459b756e694690ad6aca5':
Fix color panel bgd color
nicolasroard [Tue, 24 Sep 2013 23:45:31 +0000 (23:45 +0000)]
Merge "Fix color panel bgd color" into gb-ub-photos-carlsbad
John Hoford [Tue, 24 Sep 2013 23:34:18 +0000 (16:34 -0700)]
am
59e93986: Merge "fix print code to support landscape" into gb-ub-photos-carlsbad
* commit '
59e93986efb957b361a03ad08033f169c958a184':
fix print code to support landscape
John Hoford [Tue, 24 Sep 2013 23:31:43 +0000 (23:31 +0000)]
Merge "fix print code to support landscape" into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 23:25:43 +0000 (16:25 -0700)]
Fix color panel bgd color
Change-Id: I60b62e520a93b0432eacbf1517f26ae5597bb05d
John Hoford [Tue, 24 Sep 2013 22:14:48 +0000 (15:14 -0700)]
fix print code to support landscape
Change-Id: Ied569232a55ba953da59eeee2c13fc4608430a2d
Baligh Uddin [Tue, 24 Sep 2013 22:00:20 +0000 (22:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 24 Sep 2013 21:57:31 +0000 (21:57 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
nicolasroard [Tue, 24 Sep 2013 21:34:24 +0000 (14:34 -0700)]
am
b6b1d176: Merge "Fix style for crop activity" into gb-ub-photos-carlsbad
* commit '
b6b1d176fb50047a1590f5c601b0c54a6b1db6f8':
Fix style for crop activity
nicolasroard [Tue, 24 Sep 2013 21:31:51 +0000 (21:31 +0000)]
Merge "Fix style for crop activity" into gb-ub-photos-carlsbad
Mindy Pereira [Tue, 24 Sep 2013 21:31:12 +0000 (14:31 -0700)]
am
2aed1baf: De-blue gallery
* commit '
2aed1baf6ea4afa7a78ea24ee822a95d75534b8b':
De-blue gallery
nicolasroard [Tue, 24 Sep 2013 21:20:04 +0000 (14:20 -0700)]
Fix style for crop activity
bug:
10786662
Change-Id: Ie104b8ba2484455ad5cdf90d8c26157480143b0b
Mindy Pereira [Tue, 24 Sep 2013 16:08:06 +0000 (09:08 -0700)]
De-blue gallery
fixes b/
10914665 de-blue gallery
Change-Id: I961d5792a9e1a0187581439fa58e237b4ddeba5b
nicolasroard [Tue, 24 Sep 2013 06:37:28 +0000 (23:37 -0700)]
am
1a65cb12: Merge "Limit string to 25 characters" into gb-ub-photos-carlsbad
* commit '
1a65cb127c8002d8be57e767147d86bd131c556c':
Limit string to 25 characters
nicolasroard [Tue, 24 Sep 2013 06:34:19 +0000 (06:34 +0000)]
Merge "Limit string to 25 characters" into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 06:34:19 +0000 (23:34 -0700)]
am
8db4f458: Fix export dialog UI
* commit '
8db4f458ac9d28a508471dfb874abbe170a5ac23':
Fix export dialog UI
nicolasroard [Tue, 24 Sep 2013 06:30:36 +0000 (23:30 -0700)]
Limit string to 25 characters
bug:
10889576
Change-Id: Ib314b84d8def7dc1300fc738a1a461d37549d6e1
nicolasroard [Tue, 24 Sep 2013 06:28:11 +0000 (23:28 -0700)]
am
d04aaf62: Merge "Fix crash in caching pipeline" into gb-ub-photos-carlsbad
* commit '
d04aaf626da8aea7f8f18341499e0b51a60e4d32':
Fix crash in caching pipeline
nicolasroard [Tue, 24 Sep 2013 06:28:10 +0000 (23:28 -0700)]
am
26f23e62: Fix crashes after switching languages
* commit '
26f23e62096eb50344815e1b066e9a1efb629bb0':
Fix crashes after switching languages
nicolasroard [Tue, 24 Sep 2013 02:26:20 +0000 (19:26 -0700)]
Fix export dialog UI
bug:
10889576
bug:
10712083
Change-Id: I7921c06365775625a85e3d0a997d844c42586b01
nicolasroard [Tue, 24 Sep 2013 06:26:27 +0000 (06:26 +0000)]
Merge "Fix crash in caching pipeline" into gb-ub-photos-carlsbad
nicolasroard [Tue, 24 Sep 2013 04:42:02 +0000 (21:42 -0700)]
Fix crash in caching pipeline
Geometry filters wrongly collapsed with other filters
bug:
10903204
Change-Id: Iaee3082e605f4cdaba236df014fb41a4975d05d6
nicolasroard [Tue, 24 Sep 2013 01:36:25 +0000 (18:36 -0700)]
Fix crashes after switching languages
bug:
8148068
Change-Id: Icb23c8b221e52fe26981887a0af9857f3d58bf79
Kevin Gabayan [Tue, 24 Sep 2013 00:45:48 +0000 (17:45 -0700)]
Remove unused assets in Gallery2.
Bug:
10493013
Change-Id: I380ab6609b6a606ee5a3e9e13c8272a4e5c20cbe
nicolasroard [Mon, 23 Sep 2013 23:21:32 +0000 (16:21 -0700)]
am
105fbcf3: Fix issues with RTL support
* commit '
105fbcf3289491aa4f590057e304fee33f1c88ca':
Fix issues with RTL support
nicolasroard [Mon, 23 Sep 2013 23:12:10 +0000 (16:12 -0700)]
Fix issues with RTL support
bug:
8148068
Change-Id: I869e1a90686c46f8076a66f94040ad03c7c6ca10
Baligh Uddin [Mon, 23 Sep 2013 21:24:40 +0000 (14:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7cfedb32eb13682f0ac8353b9040519ba9b3c242
Auto-generated-cl: translation import
Baligh Uddin [Mon, 23 Sep 2013 21:17:52 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I719035e302198e02614d075af433a5bf94a7abda
Auto-generated-cl: translation import
nicolasroard [Mon, 23 Sep 2013 20:51:12 +0000 (13:51 -0700)]
am
eccdc428: Merge "Fix animation in tablet" into gb-ub-photos-carlsbad
* commit '
eccdc4285476c98bff3dc5bde113b7f855b18346':
Fix animation in tablet
nicolasroard [Mon, 23 Sep 2013 20:48:12 +0000 (20:48 +0000)]
Merge "Fix animation in tablet" into gb-ub-photos-carlsbad
nicolasroard [Mon, 23 Sep 2013 20:43:23 +0000 (13:43 -0700)]
Fix animation in tablet
- fix anim in tablet
- fix double-tap timings
- re-add draw in AOSP
Change-Id: I53be8f348ed7927812afa8a4ba84841e4b9d3f4f
Mangesh Ghiware [Mon, 23 Sep 2013 18:37:50 +0000 (11:37 -0700)]
am
889b1b25: Merge "Add (back) receiver to disable camera." into gb-ub-photos-carlsbad
* commit '
889b1b25b9928624ea1ca51cba51642d5cf4044d':
Add (back) receiver to disable camera.
Mangesh Ghiware [Mon, 23 Sep 2013 18:34:52 +0000 (18:34 +0000)]
Merge "Add (back) receiver to disable camera." into gb-ub-photos-carlsbad
nicolasroard [Mon, 23 Sep 2013 18:34:25 +0000 (11:34 -0700)]