OSDN Git Service
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: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 19:46:28 +0000 (12:46 -0700)]
Fixed initial aspect button text.
Bug:
7374910
Change-Id: I2c86b7c5b242f930692e2e6feda8a85533c509d8
Bobby Georgescu [Thu, 18 Oct 2012 04:19:57 +0000 (21:19 -0700)]
Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches
Doris Liu [Wed, 17 Oct 2012 23:15:51 +0000 (16:15 -0700)]
Save edited picasa to "Edited Online Photos" album
Bug:
7346157
This CL includes the following changes:
1) Save the new image to a new folder named "Edited Online Photos"
2) After the picture is saved, the user will be in the "Edited Online Photos" folder
3) Change the toast during saving to "Saving to" + new folder name
Change-Id: Ic505925425419ba9e3c7dac31fd403bf73d6887d
Ruben Brunk [Thu, 18 Oct 2012 00:54:19 +0000 (17:54 -0700)]
Fixed disappearing aspect ratio button.
Bug:
7369518
Change-Id: I5342339fa5a6e42d38b1ec7a8e6398bbb6901526
Bobby Georgescu [Wed, 17 Oct 2012 21:50:47 +0000 (14:50 -0700)]
Big refactor, additions to state transition animations
Bug:
7362944
Refactored a lot of the state transitions code, adding
support for definable transition animations and defining
distinct outgoing and incoming animations.
Change-Id: I31a69057ea1b72dd3185cec656e59b11fdb528c1
Ruben Brunk [Wed, 17 Oct 2012 23:58:13 +0000 (16:58 -0700)]
Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches
Ruben Brunk [Wed, 17 Oct 2012 07:40:35 +0000 (00:40 -0700)]
Added support for crop actions. Changed overflow menu to use new editor.
Bug:
7281479
Bug:
7337191
Change-Id: I91055c972666e4c2d605903646b55d8c67ae87f3
John Hoford [Wed, 17 Oct 2012 22:53:14 +0000 (15:53 -0700)]
fix crash from configurable slider ranges
bug:
7293391
Change-Id: I17498a2066acdb5c53763610980fe2f6532f2f34
Ruben Brunk [Wed, 17 Oct 2012 10:29:08 +0000 (03:29 -0700)]
Moved many strings to xml. Changed UI filter order. Renamed things.
Bug:
7344749
Bug:
7322949
Change-Id: Ia9ebc45fb2c743a458af270be429f07198ea3c1b
John Hoford [Wed, 17 Oct 2012 22:54:58 +0000 (15:54 -0700)]
Merge "fix rotating normal images" into gb-ub-photos-arches
nicolasroard [Wed, 17 Oct 2012 22:49:43 +0000 (15:49 -0700)]
Merge "Fix back button behaviour" into gb-ub-photos-arches
nicolasroard [Wed, 17 Oct 2012 22:11:53 +0000 (15:11 -0700)]
Fix back button behaviour
bug:
7290000
bug:
7256201
Change-Id: Ia6f5726b0602c45e98566bcb5e027686e7f2fe57
John Reck [Wed, 17 Oct 2012 22:05:24 +0000 (15:05 -0700)]
Only fade out if texture creation succeeded
Bug:
7366597
Change-Id: Id28970fe263d975dcd48e45fd716199bc40f64d3
John Hoford [Wed, 17 Oct 2012 21:54:54 +0000 (14:54 -0700)]
fix rotating normal images
bug:
7353416
Change-Id: I86875286ea81982bdb55e9df22e44827b521d257
Mangesh Ghiware [Wed, 17 Oct 2012 21:54:06 +0000 (14:54 -0700)]
Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches
John Reck [Wed, 17 Oct 2012 21:19:21 +0000 (14:19 -0700)]
Change double tap scale from 1.5 to 1.0
Bug:
7287834
Change-Id: I43312825c1494e385a36a3783765de33d2b691e2
nicolasroard [Wed, 17 Oct 2012 19:47:53 +0000 (12:47 -0700)]
Fix UI stuff
bug:
7354368
bug:
7362027
bug:
7344915
Change-Id: I2efd5de0971e5dfbc989d60860348280c03b3db4
John Hoford [Wed, 17 Oct 2012 19:40:30 +0000 (12:40 -0700)]
Merge "rotate images before saving" into gb-ub-photos-arches
Mangesh Ghiware [Wed, 17 Oct 2012 19:09:31 +0000 (12:09 -0700)]
Add read URI permission to intent returned for GET_CONTENT
Bug:
7366308
Bug:
7202384
GalleryProvider now requires a permission to access content.
See CL
ca181a6 for more details.
Change-Id: I4bdf61e19c9e2b6e2da0837a8f633a27c49441d7
John Hoford [Wed, 17 Oct 2012 18:41:17 +0000 (11:41 -0700)]
rotate images before saving
bug:
7353416
Change-Id: I113de1fa16725c9483a447a64ab1a41a3bbe679f
Sascha Haeberling [Tue, 16 Oct 2012 01:28:42 +0000 (18:28 -0700)]
Adds GMS Core PanoramaClient to Gallery
Bug:
7319099
Also updates the API call to LightCycleHelper.
This depends on http://go/ag/#/c/239523/
Change-Id: Ie951e44e3a474599d1da6fea52609fbb9f8dc9bc
John Hoford [Wed, 17 Oct 2012 00:09:27 +0000 (17:09 -0700)]
add support for configurable slider ranges
bug:
7293391
Change-Id: Ie4984ce85387bf4d7a0a38e318eb20f6802ffc96
Nicolas Roard [Wed, 17 Oct 2012 16:32:40 +0000 (09:32 -0700)]
Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches
Ruben Brunk [Wed, 17 Oct 2012 10:52:25 +0000 (03:52 -0700)]
Fixed flip (mirror) orientation.
Bug:
7342859
Change-Id: Ic9508927738f64e82e1bd078461b6ee1e1892300
Hung-ying Tyan [Wed, 17 Oct 2012 06:34:06 +0000 (23:34 -0700)]
Merge "Add permission to GalleryProvider." into gb-ub-photos-arches
Bobby Georgescu [Wed, 17 Oct 2012 05:57:12 +0000 (22:57 -0700)]
Merge "Update empty placeholder asset" into gb-ub-photos-arches
Bobby Georgescu [Wed, 17 Oct 2012 05:41:58 +0000 (22:41 -0700)]
Update empty placeholder asset
Bug:
7362100
Change-Id: I521c1c481a00959bb50d17fee3be6981be84a269
Bobby Georgescu [Wed, 17 Oct 2012 04:35:23 +0000 (21:35 -0700)]
Update Camera album overlay icon asset
Bug:
7332688
Change-Id: Id7ada222551187787c4e3b50f52dcdc5c6c70929
Owen Lin [Tue, 16 Oct 2012 02:22:54 +0000 (10:22 +0800)]
Add permission to GalleryProvider.
bug:
7202384
Change-Id: I1a13ed7e480163c898cf376219953b321290d4d4
Ruben Brunk [Mon, 15 Oct 2012 19:02:54 +0000 (12:02 -0700)]
Added fixed aspect ratio support for cropping.
Bug:
7350377
Change-Id: I8110ea999c764de675fe11f586ab9bc7af205f46
Bobby Georgescu [Wed, 17 Oct 2012 01:17:16 +0000 (18:17 -0700)]
Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches
John Reck [Wed, 17 Oct 2012 00:42:32 +0000 (17:42 -0700)]
Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches
John Reck [Wed, 17 Oct 2012 00:06:13 +0000 (17:06 -0700)]
Add hook to manipulate SurfaceTexture transform
Bug:
7302956
Change-Id: I32bdeb22630dbeba9f028e1c68167d10a5288a28
Bobby Georgescu [Mon, 15 Oct 2012 20:48:08 +0000 (13:48 -0700)]
Consistent animations & up button behavior in Gallery
Bug:
7302857
Bug:
7295464
This CL makes all of the transition animations throughout
the Gallery app consistent. The animation is the previous
view shrinking and fading out while the new view starts out
bigger than the view port and is coming in to the viewport
size as it fades in. Having consistent animations allows us
to not keep PhotoPage/AlbumPage instances around in certain
cases, making it possible to have consistent up button
behavior when switching between the grid and filmstrip.
Finally, this also makes the transitions in the camera app
filmstrip/grid switching consistent with those in the
gallery app.
Change-Id: I77bac6a0cde1e439738c78f9e16ab15ed5910cfb
nicolasroard [Tue, 16 Oct 2012 21:25:09 +0000 (14:25 -0700)]
Fix when we cannot load an image
bug:
7321636
Change-Id: I82cd603d531a1b743737a7c5b65005d370f2cdb1
John Hoford [Tue, 16 Oct 2012 19:39:29 +0000 (12:39 -0700)]
prevent original now acts like any other FX filter
bug:
7353358
Change-Id: Id4efa45ddb8a8a0ca6d201ffc0b45fdd2f3caabf
nicolasroard [Tue, 16 Oct 2012 20:14:38 +0000 (13:14 -0700)]
Merge "Fix curves tool" into gb-ub-photos-arches
nicolasroard [Tue, 16 Oct 2012 01:03:37 +0000 (18:03 -0700)]
Fix curves tool
bug:
7344301
bug:
7328680
bug:
7289525
bug:
7234239
Change-Id: I78d09dc2b38b11ccb2aac38ceef3acd8041f245e
Doris Liu [Tue, 16 Oct 2012 18:18:58 +0000 (11:18 -0700)]
Make save button in video trimming consistent
Bug:
7353884
Updated save button icon and text
Save button in video trimming now acts like back button when no change
has been made.
Change-Id: Iec29315222d3f3ffac9b96a89cad2821d7f86c4f
John Hoford [Tue, 16 Oct 2012 17:41:40 +0000 (10:41 -0700)]
filters now support orientation
bug:
7353416
Change-Id: Ie6f01f37428dc86d338c5cb5a80630aa3a879eaa
Wu-cheng Li [Sun, 14 Oct 2012 13:28:31 +0000 (21:28 +0800)]
Remove old camera classes.
bug:
7201108
Change-Id: I539d02c411c654238d7e5e0c34e9ec3e6e6d4d90
Owen Lin [Thu, 11 Oct 2012 07:50:38 +0000 (15:50 +0800)]
Fixes bugs in TiledTexture.
1. Upload tiles in SinglePhotoDataAdapter
2. Rebuild the upload queue after the screen nails being recycled
bug:
6399444
Change-Id: I57e756f8d1d84742bf82dd34c83baf8df89ae4cc
Owen Lin [Tue, 16 Oct 2012 02:20:57 +0000 (19:20 -0700)]
Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches
John Reck [Tue, 16 Oct 2012 00:09:04 +0000 (17:09 -0700)]
Merge "Fix build" into gb-ub-photos-arches
John Reck [Tue, 16 Oct 2012 00:08:10 +0000 (17:08 -0700)]
Fix build
Change-Id: Ic7bb61c463d237f9ee5fabc8e7f7325ecf1da43c
John Hoford [Mon, 15 Oct 2012 23:52:53 +0000 (16:52 -0700)]
Merge "fix for the cache" into gb-ub-photos-arches
John Hoford [Mon, 15 Oct 2012 22:51:02 +0000 (15:51 -0700)]
fix for the cache
Change-Id: Ib5c82aa602df961d15064e732b3701c8d6cd66ff
bug:
7345592
Mangesh Ghiware [Mon, 15 Oct 2012 23:42:17 +0000 (16:42 -0700)]
Merge "Cherry-pick of
092fd92 to fix bug
7344730 also." into gb-ub-photos-arches
John Reck [Mon, 15 Oct 2012 23:11:04 +0000 (16:11 -0700)]
Fix SRI Pano orientation
Bug:
7345511
Change-Id: I9a06f03b67ba820b86520588415ff3ab16f05829
Chih-Chung Chang [Fri, 12 Oct 2012 10:54:06 +0000 (18:54 +0800)]
Cherry-pick of
092fd92 to fix bug
7344730 also.
Make getSupportedOperations() call getSupportedOperations(boolean) by default.
So things will work for MediaObject who doesn't override the new method.
Bug:
7336562
Change-Id: Ic9ed6211981bb91c56702eafa7b21e83ed071cef
Wu-cheng Li [Mon, 15 Oct 2012 05:34:06 +0000 (22:34 -0700)]
Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches
nicolasroard [Sun, 14 Oct 2012 01:38:51 +0000 (18:38 -0700)]
Fix dimensions to use dips instead of pixels
bug:
7343798
Change-Id: I3d576ae334e580ad9da5b56d4ae84f749004ec21
nicolasroard [Sun, 14 Oct 2012 00:24:31 +0000 (17:24 -0700)]
Fix cropping and saving issues
bug:
7342359
Change-Id: Ia59eb3f423b8c4f420b7b6f120735856a84cd854
Wu-cheng Li [Sat, 13 Oct 2012 07:07:27 +0000 (15:07 +0800)]
Add stitching panorama image to secure album.
bug:
7285105
Change-Id: I9f609f30d817f10a6c9c94fc6eadb58bc1bdd580
Bobby Georgescu [Sat, 13 Oct 2012 02:35:21 +0000 (19:35 -0700)]
Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches
Bobby Georgescu [Sat, 13 Oct 2012 01:00:51 +0000 (18:00 -0700)]
Hide Camera button on empty gallery when not available
Bug:
7342583
Change-Id: I545b6902f994f7ed0245ec486e78693aea197a4a
Bobby Georgescu [Fri, 12 Oct 2012 21:08:03 +0000 (14:08 -0700)]
Merge "Improve performance of filmstrip" into gb-ub-photos-arches
Ruben Brunk [Fri, 12 Oct 2012 12:52:06 +0000 (05:52 -0700)]
Adding crop UI. Fixes a number of other UI bugs.
Bug:
7337191
Change-Id: If63dbdac6722ad4fc6c30c165d6c2eeb7011c240
Bobby Georgescu [Fri, 12 Oct 2012 00:53:22 +0000 (17:53 -0700)]
Improve performance of filmstrip
Bug:
7336758
Change-Id: I22dbf2e75bc069341a9bbc2c4dcdf7750f23be7f
Ruben Brunk [Fri, 12 Oct 2012 09:03:18 +0000 (02:03 -0700)]
Moves matrix function to GeometryMetadata. Fixes scaling issues.
Bug:
7337191
Change-Id: Icfd50c8a07ef02f2346a8ab7b57303de3866d74d
nicolasroard [Fri, 12 Oct 2012 07:58:04 +0000 (00:58 -0700)]
Merge "Add back button handling" into gb-ub-photos-arches
nicolasroard [Fri, 12 Oct 2012 07:18:51 +0000 (00:18 -0700)]
Add back button handling
bug:
7332980
- fix crash as well.
Change-Id: Id93ee7c194df6ac5e38def2e5f0fb3c5ecc0c2e4
Mangesh Ghiware [Fri, 12 Oct 2012 06:11:27 +0000 (23:11 -0700)]
Refresh panorama image after stitching completion
Bug:
7336784
Updating photo refreshes the supported operations which indiate if said
MediaItem is a panorama or not.
Change-Id: If3a169c9256b3f898594a30740930b5dfd96dba0
nicolasroard [Fri, 12 Oct 2012 04:36:12 +0000 (21:36 -0700)]
Fix UI
bug:
7328726
- add one pixel border
- hide parameter value on certain effects
- increase scale for border icons
Change-Id: Iffacec18477895701cba069500ee617bf3f9f2b7
John Hoford [Fri, 12 Oct 2012 04:04:41 +0000 (21:04 -0700)]
layouts, image icons, and layer behavour
bug:
7328726
Change-Id: I94300771dd7b6ff5b4196365f13320fbc4bdde92
Bart Sears [Fri, 12 Oct 2012 03:34:21 +0000 (20:34 -0700)]
Adjust text on Apply button
ALL CAPS was a bit loud, so go back to mixed case, lower
font size to 18dip, and remove ":".
Bug:
7333492
Change-Id: I18885808437e6328ec94c40df25ea0678d381825
nicolasroard [Fri, 12 Oct 2012 03:17:44 +0000 (20:17 -0700)]
Add new borders
bug:
7233749
Change-Id: I34afe40f85c72491dac7b26ea4433ede96e09a0a
nicolasroard [Fri, 12 Oct 2012 01:12:09 +0000 (18:12 -0700)]
Fixes Rotate, Flip, Straighten tools.
bug:
7314849
Bug:
7224232
Bug:
7218935
Change-Id: I418287ff1f81c25f8e089821d823dc29ee62ff0e
Ruben Brunk [Fri, 12 Oct 2012 00:26:29 +0000 (17:26 -0700)]
Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches
John Hoford [Fri, 12 Oct 2012 00:09:39 +0000 (17:09 -0700)]
Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches
Ruben Brunk [Thu, 11 Oct 2012 22:16:58 +0000 (15:16 -0700)]
Fixed apply bar text. Moved strings to xml.
Bug:
7333492
Change-Id: I650a7178e5351c98d0bf5808ccdf6c597a88dada
Bobby Georgescu [Thu, 11 Oct 2012 23:00:01 +0000 (16:00 -0700)]
Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches
Mangesh Ghiware [Thu, 11 Oct 2012 01:37:24 +0000 (18:37 -0700)]
Move calls to LightCycleHelper off the UI thread.
Bug:
7320303
Replace multiple methods in LightCycleHelper with a single one that
returns relevant metadata.
Change-Id: Iaa75b3c1ccc8a5b724b253cec654b5b5acb4878e
Bobby Georgescu [Thu, 11 Oct 2012 21:49:09 +0000 (14:49 -0700)]
Change ActionBar spinner text size on rotate
Bug:
7333151
Update the grid/filmstrip spinner switch text to
look and behave like the text in the Gmail app, as
requested by UX.
Change-Id: If822b21899172a35402477868d4f146a8e00cfea
John Hoford [Thu, 11 Oct 2012 19:55:05 +0000 (12:55 -0700)]
fixed manta image size and double FX issue
bug:
7328636
Change-Id: I572255c65fb2d461dce6f52d056be6b3c4d987f6
George Mount [Thu, 11 Oct 2012 17:35:01 +0000 (10:35 -0700)]
Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 17:17:40 +0000 (10:17 -0700)]
Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches
John Hoford [Thu, 11 Oct 2012 17:11:57 +0000 (10:11 -0700)]
Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches
George Mount [Thu, 11 Oct 2012 16:51:32 +0000 (09:51 -0700)]
Clear cached stitching preview thumbnails.
Bug
7328408
Change-Id: Ifbc469dc9eef95025cd8e828a0df80e76d2ff064
John Reck [Thu, 11 Oct 2012 16:40:18 +0000 (09:40 -0700)]
Fix portrait orientation on landscape devices
Bug:
7328349
Change-Id: I0f871ea56e6afb5ba0b54cac15c18f79db07f4f9
John Hoford [Thu, 11 Oct 2012 16:13:40 +0000 (09:13 -0700)]
Fix application of FX to not wipe out borders etc.
bug:
7289442
Change-Id: I9efdfdc1d8a8c02a718e91a089b531ff26fd582d
Owen Lin [Thu, 11 Oct 2012 07:08:50 +0000 (15:08 +0800)]
Revert "Revert "Upload screennails in tiles to prevent jank""
This reverts commit
ad7cf187bf0c11b05aa3eab7085148e0353f2af5.
bug:
6399444
Change-Id: I94b286ab3e0db21c582cbfa9183489613da30edb
Ruben Brunk [Thu, 11 Oct 2012 01:28:12 +0000 (18:28 -0700)]
Remove compare and reset from apply bar and fix text.
Bug:
7326079
Change-Id: Ifb4d42ec9f30b9c2c6d46e943ca36c915a15c024
Bobby Georgescu [Thu, 11 Oct 2012 06:48:52 +0000 (23:48 -0700)]
Behavior of camera filmstrip in gallery closer to camera
Bug:
7329118
Change-Id: I0a5753db301cc53050251455439555aa7ae414c4
Bobby Georgescu [Thu, 11 Oct 2012 06:29:18 +0000 (23:29 -0700)]
Fix size of peripheral items when first opening filmstrip
Bug:
7327570
Change-Id: I168a0297e9ac65786dbb05c02228665a67f80dff
Bobby Georgescu [Thu, 11 Oct 2012 05:04:54 +0000 (22:04 -0700)]
Fix NPE in PhotoPage.updateMenuOperations
Bug:
7324012
Change-Id: If09d20b7ab64abe9020f7f6301356ed9a4155d5b
Bobby Georgescu [Thu, 11 Oct 2012 04:09:07 +0000 (21:09 -0700)]
Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 01:16:10 +0000 (18:16 -0700)]
Make album set grid view reflect latest UI mocks
Bug:
7300836
Change-Id: I3024b8ffbba7ee08642012c80509992335bbd5bf
Bobby Georgescu [Wed, 10 Oct 2012 17:49:51 +0000 (10:49 -0700)]
Defer expensive UI updates in filmstrip
Bug:
7322925
When using the filmstrip, delay expensive updates to
the action bar and share menus, some of which may require
disk accesses, until the rate of change of photos slows
down, instead of doing this work for every single image
that flies by.
Change-Id: Ie82adb4d54c96fec837d5954a91e1d4a17f548dd
George Mount [Thu, 11 Oct 2012 00:03:10 +0000 (17:03 -0700)]
Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches
Bobby Georgescu [Thu, 11 Oct 2012 00:00:48 +0000 (17:00 -0700)]
Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches
George Mount [Wed, 10 Oct 2012 23:59:45 +0000 (16:59 -0700)]
Fix NPE due to progress bar not existing.
Bug
7325685
Change-Id: I5e24b4f8a0ee4016c122e14702e3ae575f5bb56f
Bobby Georgescu [Wed, 10 Oct 2012 22:57:17 +0000 (15:57 -0700)]
Change FilterShow theme and extra remove gray line
Bug:
7326326
Change-Id: Ie2286e36da77fb22907f21d084177268f919d10e
John Hoford [Wed, 10 Oct 2012 23:13:36 +0000 (16:13 -0700)]
forced fx bitmaps to load unscaled
bug:
7327105
Change-Id: I780638f6919e89ae957993732fdbe123e8d8e866
John Hoford [Wed, 10 Oct 2012 22:45:47 +0000 (15:45 -0700)]
Merge "add White balance & disable UI elements" into gb-ub-photos-arches
Mangesh Ghiware [Wed, 10 Oct 2012 22:19:03 +0000 (15:19 -0700)]
Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches
John Hoford [Wed, 10 Oct 2012 21:17:30 +0000 (14:17 -0700)]
add White balance & disable UI elements
bug:
7234321
Change-Id: Ic44bfe30b5d25e7d4442c4e6d4fd9e0e8410c7af