OSDN Git Service
Michael Kolb [Mon, 6 May 2013 22:16:09 +0000 (15:16 -0700)]
Quick and Dirty build fix
Change-Id: I4266fa63145a95d878a9fc0effab937ec0859bab
George Mount [Mon, 6 May 2013 20:41:32 +0000 (13:41 -0700)]
am
08d2c513: Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce
* commit '
08d2c51392978383699aedcf63d24e5122b3b7a5':
Fix black background on save progress indicator.
George Mount [Mon, 6 May 2013 20:40:25 +0000 (20:40 +0000)]
Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce
Michael Kolb [Mon, 6 May 2013 20:22:25 +0000 (13:22 -0700)]
am
ea75136a: Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce
* commit '
ea75136ae4abf55070644e5a048cf44323517c43':
Fix lockscreen camera widget layout
Michael Kolb [Mon, 6 May 2013 20:21:19 +0000 (20:21 +0000)]
Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce
Michael Kolb [Mon, 6 May 2013 19:41:34 +0000 (12:41 -0700)]
Fix lockscreen camera widget layout
Bug:
8832891
Change-Id: I4658de74e7cc9d4ba80a561b3e71ae6339d4f236
Doris Liu [Mon, 6 May 2013 17:24:54 +0000 (10:24 -0700)]
am
3a50eb36: Merge "Restrict checking for device flip" into gb-ub-photos-bryce
* commit '
3a50eb36cf760ddb2a11c72b247f96611f3bf112':
Restrict checking for device flip
Doris Liu [Mon, 6 May 2013 17:23:09 +0000 (17:23 +0000)]
Merge "Restrict checking for device flip" into gb-ub-photos-bryce
George Mount [Mon, 6 May 2013 17:06:53 +0000 (10:06 -0700)]
Fix black background on save progress indicator.
Bug
8802092
Change-Id: I40075ba6af69895a88973d906436c6e235c733fa
Michael Kolb [Mon, 6 May 2013 16:59:46 +0000 (09:59 -0700)]
am
1e3bc7d4: Set correct label text in tap mode
* commit '
1e3bc7d4873dbc0778d5e12333c73c00bcd6512f':
Set correct label text in tap mode
Michael Kolb [Mon, 6 May 2013 15:49:10 +0000 (08:49 -0700)]
Set correct label text in tap mode
Bug:
8826229
Change-Id: I10b06ac04314beaf52fc8b29c9b10693eb11311b
Baligh Uddin [Sat, 4 May 2013 23:18:08 +0000 (16:18 -0700)]
am
49a24225: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
49a242256761f990001c3f81c54e4897f58ebc36':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 4 May 2013 23:16:10 +0000 (23:16 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Doris Liu [Fri, 3 May 2013 21:33:57 +0000 (14:33 -0700)]
Restrict checking for device flip
Bug:
8714114
Change-Id: Ic12627fe5b7512c8d5739ed801130d52f33407cc
Baligh Uddin [Fri, 3 May 2013 20:36:23 +0000 (13:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id960caeb9b28300e0f6ee817f0bf1ea783e0f3fb
Auto-generated-cl: translation import
Doris Liu [Fri, 3 May 2013 20:02:56 +0000 (13:02 -0700)]
am
cd0fb7af: Fix NPE caused by insets never being set
* commit '
cd0fb7af20f855e1190122467c5650e46bfe820c':
Fix NPE caused by insets never being set
Doris Liu [Fri, 3 May 2013 18:44:45 +0000 (11:44 -0700)]
Fix NPE caused by insets never being set
Bug:
8804054
Change-Id: Ie0f2dec9681977621ba95650aa714b0733a30858
Doris Liu [Fri, 3 May 2013 18:11:38 +0000 (11:11 -0700)]
am
4b9dea3a: Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce
* commit '
4b9dea3a1496271b73a7b5a4f62ad3bb3b5cdadc':
Anchor camera controls when flipping device
Doris Liu [Fri, 3 May 2013 18:09:49 +0000 (18:09 +0000)]
Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce
Angus Kong [Fri, 3 May 2013 17:42:30 +0000 (10:42 -0700)]
am
b0a1e9fe: Don\'t show settings when popup is shown.
* commit '
b0a1e9fe925be1745bfb224867ee53562e027145':
Don't show settings when popup is shown.
Doris Liu [Fri, 3 May 2013 17:26:01 +0000 (10:26 -0700)]
Anchor camera controls when flipping device
Also adjusted margins for camera root view to avoid covering undo bar
Bug:
8758513
Bug:
8714114
Change-Id: If27f55a40f95402923d59d162db0c7cc29eabba4
Angus Kong [Fri, 3 May 2013 00:45:01 +0000 (17:45 -0700)]
Don't show settings when popup is shown.
bug:
8771618
Change-Id: Idec1cbacec1ae958c7295facadc6653b840dbe50
George Mount [Thu, 2 May 2013 17:20:58 +0000 (10:20 -0700)]
am
6d7a2d3e: Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce
* commit '
6d7a2d3e32a27de28336176f856a7439b36252bd':
Class to simplify use of GalleryBitmapPool for decoding Bitmaps.
Allow prefetch for cache, reducing priority for prefetched images.
George Mount [Thu, 2 May 2013 17:19:24 +0000 (17:19 +0000)]
Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce
* changes:
Class to simplify use of GalleryBitmapPool for decoding Bitmaps.
Allow prefetch for cache, reducing priority for prefetched images.
George Mount [Tue, 30 Apr 2013 18:53:46 +0000 (11:53 -0700)]
Class to simplify use of GalleryBitmapPool for decoding Bitmaps.
Bug
8446191
Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63
Change-Id: Ia9b2ced0bfd9c9c1b969c77bc89eaa0fa87687bb
George Mount [Wed, 1 May 2013 23:56:32 +0000 (16:56 -0700)]
Allow prefetch for cache, reducing priority for prefetched images.
Bug
8446191
Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63
Change-Id: I7cccfffc539988d26fc751e16726b05fb2ba21bd
nicolasroard [Thu, 2 May 2013 06:36:34 +0000 (23:36 -0700)]
am
f469a168: Fix flashing (remove clipping)
* commit '
f469a1689a9563f3c5bb68f46a5d9cd152d67053':
Fix flashing (remove clipping)
nicolasroard [Thu, 2 May 2013 03:48:56 +0000 (20:48 -0700)]
Fix flashing (remove clipping)
bug:
8747333
Change-Id: Ie1e7f1a58bf195b1f427b75ee9a1390e29b3ba2a
nicolasroard [Thu, 2 May 2013 03:30:04 +0000 (20:30 -0700)]
nicolasroard [Wed, 1 May 2013 03:50:03 +0000 (20:50 -0700)]
Fix UI
bug:
8664728
Change-Id: I90b903e8935b2b6c0dbd6590cff36865644c49b4
Bobby Georgescu [Thu, 2 May 2013 00:49:38 +0000 (17:49 -0700)]
am
5a352be0: Increase selection limit
* commit '
5a352be0df79b03c942eb67a799ddb3aaa1a26a2':
Increase selection limit
Bobby Georgescu [Thu, 2 May 2013 00:27:19 +0000 (17:27 -0700)]
Increase selection limit
Bug:
8606565
Bug:
8721237
Bug:
8752803
Change-Id: I578536389146fb4d8735c8171ec346ebe49de729
Ruben Brunk [Wed, 1 May 2013 23:08:26 +0000 (23:08 +0000)]
Merge "G+ activity xform stack and pipeline cleanup." into gb-ub-photos-carlsbad
John Hoford [Wed, 1 May 2013 22:50:30 +0000 (15:50 -0700)]
fix crash due to no ImageFilterDraw
Change-Id: I0c8bfaa7d162f5c1a49f05d853f4700322fe5901
Michael Kolb [Wed, 1 May 2013 21:50:04 +0000 (14:50 -0700)]
am
fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce
* commit '
fb9361419abfac7f893674bb6f4d1b1f8ab1f677':
Fix layout and preview for tablets
Michael Kolb [Wed, 1 May 2013 21:48:29 +0000 (21:48 +0000)]
Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce
Michael Kolb [Wed, 1 May 2013 20:28:24 +0000 (13:28 -0700)]
Fix layout and preview for tablets
Bug:
8253060
Make controls full screen, and layout according to required size
Change-Id: I725547041264457d85d73d470d25caa5cb2cf783
Michael Kolb [Wed, 1 May 2013 20:59:37 +0000 (13:59 -0700)]
Fix new activity menus
Change-Id: If8ace52a46284b41169532b69bdf77305b9610d9
Baligh Uddin [Wed, 1 May 2013 20:50:48 +0000 (13:50 -0700)]
am
32aa7da8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
32aa7da8dc533a5add4ca7c94a69201ff5ed9a90':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 1 May 2013 20:48:43 +0000 (20:48 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Michael Kolb [Wed, 1 May 2013 20:31:38 +0000 (13:31 -0700)]
am
c43e5b6b: Update capture animation
* commit '
c43e5b6bd84f5a7635766f70677097f6958f4058':
Update capture animation
Michael Kolb [Wed, 1 May 2013 20:31:37 +0000 (13:31 -0700)]
am
03e752e0: Update scene mode off icon in menu
* commit '
03e752e0c9f9978663fb5bca06edd5e56476132e':
Update scene mode off icon in menu
Michael Kolb [Wed, 1 May 2013 20:31:36 +0000 (13:31 -0700)]
am
9ea4147f: Update location indicator correctly
* commit '
9ea4147f6220e3a9fb6f9ae3fef46036919641b4':
Update location indicator correctly
Michael Kolb [Wed, 1 May 2013 20:31:35 +0000 (13:31 -0700)]
am
64c9c183: Adjust switcher animation
* commit '
64c9c183384b9df6dafe0142f10c4f7b802d54bf':
Adjust switcher animation
Michael Kolb [Wed, 1 May 2013 20:31:35 +0000 (13:31 -0700)]
am
b048226f: Merge "Align review controls" into gb-ub-photos-bryce
* commit '
b048226feed739f122ffb39fca51fedaec791e67':
Align review controls
Mangesh Ghiware [Wed, 1 May 2013 20:31:34 +0000 (13:31 -0700)]
am
fe804d11: Handle onDowngrade in PhotoDatabase
* commit '
fe804d11f398b3c03b4a6ccffcfdac56e1728de4':
Handle onDowngrade in PhotoDatabase
Michael Kolb [Wed, 1 May 2013 20:31:33 +0000 (13:31 -0700)]
am
ce8f6d1b: Remove empty slots from menu
* commit '
ce8f6d1bb9dc52da7d168a94cb4c6f24d631d304':
Remove empty slots from menu
Baligh Uddin [Wed, 1 May 2013 20:31:32 +0000 (13:31 -0700)]
am
aa3541c5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
aa3541c5f8e64f6f6cf7d5c80f1aeaacde51a4f0':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 1 May 2013 20:31:31 +0000 (13:31 -0700)]
am
9ce3bef0: (-s ours) Import translations. DO NOT MERGE
* commit '
9ce3bef0a877c5573256ea8a76642e45dac92cc4':
Import translations. DO NOT MERGE
Michael Kolb [Wed, 1 May 2013 20:22:18 +0000 (13:22 -0700)]
am
9c525edf: Merge "Remove timer indicator" into gb-ub-photos-bryce
* commit '
9c525edf6440b6daf10885f4f7a0da479b7f2707':
Remove timer indicator
John Hoford [Wed, 1 May 2013 20:19:06 +0000 (13:19 -0700)]
resolved conflicts for merge of
d6edcee3 to gb-ub-photos-carlsbad
Change-Id: I24057e85ca5b0409e9bcb92c85577fb9a763fbe4
Michael Kolb [Tue, 30 Apr 2013 22:34:19 +0000 (15:34 -0700)]
Update capture animation
Bug:
8253060
Update preview thumb margins and size
Add touch target for thumbnail
Change-Id: I2b298de330834c42a55b4cb082148d971727f530
Baligh Uddin [Wed, 1 May 2013 18:10:48 +0000 (11:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7a4b256e2ef8d9eea311c8945be7caa93ff5609c
Auto-generated-cl: translation import
Michael Kolb [Wed, 1 May 2013 18:04:15 +0000 (11:04 -0700)]
Update scene mode off icon in menu
Bug:
8656593
Change-Id: Ic310bd896a02ae842c5a5af180dfcec289c679fc
Ruben Brunk [Wed, 1 May 2013 01:56:25 +0000 (18:56 -0700)]
G+ activity xform stack and pipeline cleanup.
Change-Id: I3277dd4e709146ca2c06b56a1db200d3130dd5e3
Michael Kolb [Tue, 30 Apr 2013 22:38:49 +0000 (15:38 -0700)]
Update location indicator correctly
Bug:
8768592
Change-Id: I8f94b4fb62174c4c27e6dbdc68ba272b0d3ae371
Michael Kolb [Tue, 30 Apr 2013 18:49:11 +0000 (11:49 -0700)]
Adjust switcher animation
Bug:
8754841
Change-Id: I7a25527297eddd11f9c9a025986ff857f97c07be
Michael Kolb [Tue, 30 Apr 2013 20:58:33 +0000 (20:58 +0000)]
Merge "Align review controls" into gb-ub-photos-bryce
Michael Kolb [Tue, 30 Apr 2013 20:46:17 +0000 (13:46 -0700)]
Align review controls
Bug:
8753607
Change-Id: Iea2cef5bf56c82c2ddbd7191be6345a58fa126c9
Mangesh Ghiware [Tue, 30 Apr 2013 16:35:31 +0000 (09:35 -0700)]
Handle onDowngrade in PhotoDatabase
Bug:
8683352
Change-Id: Iefaa425a753c8242dc345efd96354bbb7b5bb999
Michael Kolb [Tue, 30 Apr 2013 16:23:23 +0000 (09:23 -0700)]
Remove empty slots from menu
Bug:
8640131
When a specific camera doesn't support one of the menu options,
the option is removed from the menu, no empty spot anymore.
Change-Id: I002d6347c35cb0bfd5f71d880294f04f45ffb38f
Baligh Uddin [Tue, 30 Apr 2013 15:45:39 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Tue, 30 Apr 2013 08:10:14 +0000 (01:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie7162610e7c9c69d5d5e70d552f9c8bece66cefa
Auto-generated-cl: translation import
Baligh Uddin [Tue, 30 Apr 2013 08:07:20 +0000 (01:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I03986a2e5f9465f377739c18d672574c34464960
Auto-generated-cl: translation import
Michael Kolb [Tue, 30 Apr 2013 03:27:07 +0000 (03:27 +0000)]
Merge "Remove timer indicator" into gb-ub-photos-bryce
John Hoford [Tue, 30 Apr 2013 01:18:07 +0000 (01:18 +0000)]
Merge "small ui changes based on UX/PM feedback" into gb-ub-photos-bryce
nicolasroard [Tue, 30 Apr 2013 00:52:16 +0000 (00:52 +0000)]
Merge "Modifications for simple edit" into gb-ub-photos-carlsbad
nicolasroard [Fri, 26 Apr 2013 21:51:48 +0000 (14:51 -0700)]
Modifications for simple edit
Change-Id: Ic200a4f1e843deb119d68f627d5b8adb201f0f7f
Michael Kolb [Mon, 29 Apr 2013 23:22:26 +0000 (16:22 -0700)]
Remove timer indicator
Bug:
8754833
Change-Id: I1750ac4ad7300605c3e65015ac9a94d012d26db2
Michael Kolb [Mon, 29 Apr 2013 23:04:00 +0000 (16:04 -0700)]
am
ef878669: Fix indicator layout
* commit '
ef87866904722e6d381445a98b61a948e004970e':
Fix indicator layout
Michael Kolb [Mon, 29 Apr 2013 21:50:41 +0000 (14:50 -0700)]
Fix indicator layout
Bug:
8754592
Use the correct anchor for layout
Change-Id: Idc408da48dd3066a8dabdd8f4f2c553b54d0dffd
John Hoford [Mon, 29 Apr 2013 14:30:33 +0000 (07:30 -0700)]
small ui changes based on UX/PM feedback
bug:
8664728
Change-Id: I4e0651c011b9a6c4742d86c898a0821187f43043
Ruben Brunk [Mon, 29 Apr 2013 18:54:51 +0000 (11:54 -0700)]
am
9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryce
* commit '
9e5b079934538f2c90d0ac995330fb006b738cc7':
Cleanup crop activity UI.
Ruben Brunk [Mon, 29 Apr 2013 18:54:12 +0000 (18:54 +0000)]
Merge "Cleanup crop activity UI." into gb-ub-photos-bryce
Bobby Georgescu [Mon, 29 Apr 2013 18:03:40 +0000 (11:03 -0700)]
am
384971f7: Instrument importer for usage statistics
* commit '
384971f7ce93c98249825d0498ad4bcbd4104895':
Instrument importer for usage statistics
Bobby Georgescu [Sun, 28 Apr 2013 19:44:55 +0000 (12:44 -0700)]
Instrument importer for usage statistics
Bug:
8744068
Change-Id: I416463ba15713d363ac0ce68109532b770fb02b3
Angus Kong [Fri, 26 Apr 2013 23:33:00 +0000 (16:33 -0700)]
am
a042bfaa: Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce
* commit '
a042bfaa31e514ea0979936d39cde8696fc0ece0':
Delegate the texture copy to DrawClient.
Angus Kong [Fri, 26 Apr 2013 23:30:49 +0000 (23:30 +0000)]
Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce
Bobby Georgescu [Fri, 26 Apr 2013 23:20:54 +0000 (16:20 -0700)]
am
45377ce9: Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryce
* commit '
45377ce902eb0dce6fb6b1e58925654822e25a19':
Log name of borders and filters of saved images
Bobby Georgescu [Fri, 26 Apr 2013 23:19:36 +0000 (23:19 +0000)]
Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryce
Michael Kolb [Fri, 26 Apr 2013 23:01:44 +0000 (16:01 -0700)]
am
8021e39d: Merge "Add new indicators" into gb-ub-photos-bryce
* commit '
8021e39d649be4603e66d5f82cef607ada87d56b':
Add new indicators
Michael Kolb [Fri, 26 Apr 2013 23:00:13 +0000 (23:00 +0000)]
Merge "Add new indicators" into gb-ub-photos-bryce
Michael Kolb [Fri, 26 Apr 2013 18:09:29 +0000 (11:09 -0700)]
Add new indicators
Bug:
8640131
Change-Id: I9e567ddafa130e84af4d56a69ba7e389e64e3456
Bobby Georgescu [Fri, 26 Apr 2013 22:32:36 +0000 (15:32 -0700)]
am
568a8cf9: Dismiss MTP notification on device disconnect
* commit '
568a8cf9ec253a635a36866efc0e3acebbba2a2e':
Dismiss MTP notification on device disconnect
Bobby Georgescu [Fri, 26 Apr 2013 22:27:14 +0000 (15:27 -0700)]
Log name of borders and filters of saved images
Bug:
8712946
Change-Id: Id7b32ceb00b131299c6d8630bca181141dc204fd
Bobby Georgescu [Fri, 26 Apr 2013 22:07:01 +0000 (15:07 -0700)]
Dismiss MTP notification on device disconnect
Bug:
8158516
Change-Id: I7d7fd78b5fb9dc199e9ecdd78440e0f8147fe58d
Angus Kong [Fri, 26 Apr 2013 18:17:58 +0000 (11:17 -0700)]
Delegate the texture copy to DrawClient.
bug:
8109314
Change-Id: Ib70b9d4fa4edbf094bc0d4644b3994a5e8303013
Baligh Uddin [Fri, 26 Apr 2013 21:59:48 +0000 (14:59 -0700)]
am
4060811a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
4060811aa01c7fc4ed98aa3f1c98b8948fd0a395':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 26 Apr 2013 21:56:43 +0000 (14:56 -0700)]
am
9a21fba3: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
9a21fba30a55c75ac6ad76f3f180e16436e5e31d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 26 Apr 2013 21:56:28 +0000 (21:56 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 26 Apr 2013 21:55:17 +0000 (21:55 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Ruben Brunk [Thu, 25 Apr 2013 23:31:57 +0000 (16:31 -0700)]
Cleanup crop activity UI.
Bug:
8734193
Bug:
8723843
Change-Id: I09f0e8fcb0d919c573ad9a6f7b9f060f667d1d0d
Bobby Georgescu [Fri, 26 Apr 2013 18:52:16 +0000 (11:52 -0700)]
am
ec6d1d85: Merge "Show notification to relaunch MTP importer" into gb-ub-photos-bryce
* commit '
ec6d1d852e7970da5c64dd9e37f58f741b713fa2':
Show notification to relaunch MTP importer
Bobby Georgescu [Fri, 26 Apr 2013 18:50:43 +0000 (18:50 +0000)]
Merge "Show notification to relaunch MTP importer" into gb-ub-photos-bryce
Baligh Uddin [Fri, 26 Apr 2013 18:17:05 +0000 (11:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I638990d511e9c7186d7a6096a9d7308cccbaf9b3
Auto-generated-cl: translation import
Baligh Uddin [Fri, 26 Apr 2013 18:15:08 +0000 (11:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5d5299a773df9f8bf62e3057f626d414569989fb
Auto-generated-cl: translation import
Michael Kolb [Fri, 26 Apr 2013 18:11:07 +0000 (11:11 -0700)]
am
d04ba19a: Merge "Center Video menu" into gb-ub-photos-bryce
* commit '
d04ba19a49bc26e34c7b5c7832c46058100e986d':
Center Video menu
Michael Kolb [Fri, 26 Apr 2013 18:11:06 +0000 (11:11 -0700)]
am
132eb666: Merge "Don\'t render label on focus ring" into gb-ub-photos-bryce
* commit '
132eb666756115e578dada36624b977ac4d10e38':
Don't render label on focus ring
Michael Kolb [Fri, 26 Apr 2013 18:10:17 +0000 (18:10 +0000)]
Merge "Center Video menu" into gb-ub-photos-bryce
Michael Kolb [Fri, 26 Apr 2013 18:10:03 +0000 (18:10 +0000)]
Merge "Don't render label on focus ring" into gb-ub-photos-bryce