OSDN Git Service
Nimrod Gileadi [Wed, 2 Mar 2016 09:17:20 +0000 (09:17 +0000)]
Merge "Close InputStream in BatteryStatsHelper" into nyc-dev
Tomasz Mikolajewski [Wed, 2 Mar 2016 09:00:46 +0000 (09:00 +0000)]
Merge "Fix DocumentUI's perf tests compile failure." into nyc-dev
Tomasz Mikolajewski [Wed, 2 Mar 2016 08:57:46 +0000 (17:57 +0900)]
Fix DocumentUI's perf tests compile failure.
It compiled locally, but not on the APCT.
Bug:
27370274
Change-Id: I7f10f3bf5b370d8e92311febfdcae133148e1312
Diego Perez [Wed, 2 Mar 2016 08:57:25 +0000 (08:57 +0000)]
Merge "Fix layoutlib expand unit test" into nyc-dev
Erik Kline [Wed, 2 Mar 2016 08:37:06 +0000 (08:37 +0000)]
Add 464xlat notification callback
am:
8d6edc3270
* commit '
8d6edc3270616b119645fbdf8752c0ea37de0731':
Add 464xlat notification callback
Lorenzo Colitti [Wed, 2 Mar 2016 08:32:50 +0000 (08:32 +0000)]
Merge changes Id78aab9c,I51096b18 into nyc-dev
* changes:
Speed up ConnectivityServiceTest.
Make it easier to test code that uses WakeupMessage.
Tomasz Mikolajewski [Wed, 2 Mar 2016 08:06:02 +0000 (08:06 +0000)]
Merge "Add a missing include in DocumentsUI Android.mk." into nyc-dev
Tomasz Mikolajewski [Wed, 2 Mar 2016 07:58:55 +0000 (16:58 +0900)]
Add a missing include in DocumentsUI Android.mk.
Without it, perf tests were not built on APCT.
Bug:
27370274
Change-Id: Ie154526d240bb9d1b4cce6fc089d502bf808c366
Lorenzo Colitti [Sat, 20 Feb 2016 16:09:26 +0000 (01:09 +0900)]
Speed up ConnectivityServiceTest.
1. Override WakeupMessage with an implementation that uses
sendEmptyMessageDelayed. This allows us to replace a
6-second sleep with a 150ms wait.
2. Change waitFor()'s polling interval from 100ms to 50ms.
With these changes ConnectivityServiceTest goes from ~9s to ~3s.
Change-Id: Id78aab9cded90a5b17f09d7f437904e179808dd2
Erik Kline [Mon, 29 Feb 2016 07:00:01 +0000 (16:00 +0900)]
Add 464xlat notification callback
Bug:
26238390
Bug:
26991160
Change-Id: I556e779c642d19cd8d26637dd98055157d005f77
Tomasz Mikolajewski [Wed, 2 Mar 2016 06:12:28 +0000 (06:12 +0000)]
Merge "Fix broken tests due to uninitialized roots." into nyc-dev
Tomasz Mikolajewski [Wed, 2 Mar 2016 05:38:23 +0000 (14:38 +0900)]
Fix broken tests due to uninitialized roots.
Change-Id: I014657cab86ffa17290ab8990f0adaa6f6451e15
Sungsoo Lim [Wed, 2 Mar 2016 05:40:00 +0000 (05:40 +0000)]
Merge "MediaBrowserService: Make SubscriptionCallback.onError be called" into nyc-dev
Tomasz Mikolajewski [Wed, 2 Mar 2016 05:35:02 +0000 (05:35 +0000)]
Merge "Add scaffolds for performance tests of DocumentsUI" into nyc-dev
Lorenzo Colitti [Sat, 20 Feb 2016 16:04:13 +0000 (01:04 +0900)]
Make it easier to test code that uses WakeupMessage.
Code that uses WakeupMessage uses the AlarmManager. Testing such
code is slow because AlarmManager.MIN_FUTURITY ensures that
alarms must wait at least 5 seconds before firing.
This change makes WakeupMessage's fields protected so that test
code can subclass from it and override schedule() and cancel()
with implementations that do not use AlarmManager, for example
by making schedule() call sendEmptyMessageDelayed and making
cancel() call removeMessages.
Change-Id: I51096b182d9eb87cc7bd46c3c91906f18356b354
Sungsoo Lim [Tue, 23 Feb 2016 08:30:33 +0000 (17:30 +0900)]
MediaBrowserService: Make SubscriptionCallback.onError be called
Bug:
26733259
Change-Id: I8324e1c56e87071e781550ac0701e632a4122e73
Wale Ogunwale [Wed, 2 Mar 2016 04:46:52 +0000 (04:46 +0000)]
Merge "Enable add/remove window manager log points" into nyc-dev
Wale Ogunwale [Wed, 2 Mar 2016 04:42:53 +0000 (20:42 -0800)]
Enable add/remove window manager log points
To debug
27286867.
Bug:
27286867
Change-Id: Iab5e608f8437ee0e315bfa3d091980f4a9e3a3b5
Hyunyoung Song [Wed, 2 Mar 2016 04:40:45 +0000 (04:40 +0000)]
Merge "Update wallpaper asset for N dev preview Bug:
27434845" into nyc-dev
Hyunyoung Song [Wed, 2 Mar 2016 04:39:03 +0000 (20:39 -0800)]
Update wallpaper asset for N dev preview
Bug:
27434845
Change-Id: I0f9ff168beab12d630ab824ab632f98051564570
Lorenzo Colitti [Wed, 2 Mar 2016 04:18:02 +0000 (04:18 +0000)]
Merge changes Ic366b532,I0179b45b into nyc-dev
* changes:
Move PinningNetworkCallback out to a new NetworkPinner class.
Use MessageUtils in ConnectivityManager.
Tomasz Mikolajewski [Wed, 24 Feb 2016 03:53:44 +0000 (12:53 +0900)]
Add scaffolds for performance tests of DocumentsUI
Bug:
27370274
Change-Id: I14dea1b85cd84c8bb3c0eee27b2954108bfa4f8b
Lorenzo Colitti [Tue, 1 Mar 2016 03:55:58 +0000 (12:55 +0900)]
Move PinningNetworkCallback out to a new NetworkPinner class.
Also add tests.
Bug:
19159232
Change-Id: Ic366b53259ee5944a8e864876425a6558c0a7216
Bryce Lee [Wed, 2 Mar 2016 03:21:35 +0000 (03:21 +0000)]
DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles. am:
7c2539e2a5 -s ours
am:
21c47d1b22 -s ours
* commit '
21c47d1b22cfa317d7925b01de1c13cc2a39b3d6':
DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.
Jeff Sharkey [Wed, 2 Mar 2016 03:17:41 +0000 (03:17 +0000)]
Merge "When system server goes down, crash admins." into nyc-dev
Jeff Sharkey [Wed, 2 Mar 2016 02:46:25 +0000 (19:46 -0700)]
When system server goes down, crash admins.
Apps making calls into the system server may end up persisting
internal state or making security decisions based on the perceived
success or failure of a call, or the default values returned.
The reality is that if the system process just died, init will be
along shortly to kill all running apps, so we should have no problem
rethrowing the RemoteException as a RuntimeException.
Bug:
27364859
Change-Id: I866a8c3c9682da1de2a31fe8b4ffcc9d7f4d8ba0
Bryce Lee [Wed, 2 Mar 2016 03:12:09 +0000 (03:12 +0000)]
DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.
am:
7c2539e2a5 -s ours
* commit '
7c2539e2a50ec3dcdb1c9420f9215bba438b21b6':
DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.
Jeff Sharkey [Wed, 2 Mar 2016 02:42:14 +0000 (02:42 +0000)]
Merge "When system server goes down, crash apps more." into nyc-dev
Fyodor Kupolov [Wed, 2 Mar 2016 02:41:51 +0000 (02:41 +0000)]
Merge "Restored switchTo method" into nyc-dev
Fyodor Kupolov [Wed, 2 Mar 2016 02:39:27 +0000 (18:39 -0800)]
Restored switchTo method
It is current used in another branch. Restored to fix a breakage.
Change-Id: Iec98bf525b88b6b5b45bffb97a1f3e9b57c492dd
Jeff Sharkey [Wed, 2 Mar 2016 02:27:23 +0000 (19:27 -0700)]
When system server goes down, crash apps more.
Apps making calls into the system server may end up persisting
internal state or making security decisions based on the perceived
success or failure of a call, or the default values returned.
The reality is that if the system process just died, init will be
along shortly to kill all running apps, so we should have no problem
rethrowing the RemoteException as a RuntimeException.
Bug:
27364859
Change-Id: Ife0bcb079636c88d54c44d17eb580409fd79028b
Jeff Sharkey [Wed, 2 Mar 2016 01:54:11 +0000 (01:54 +0000)]
Merge "Start unaware persistent apps after user unlocked." into nyc-dev
Vadim Tryshev [Wed, 2 Mar 2016 01:52:18 +0000 (01:52 +0000)]
Merge "Revert "Adding getManagedUserBadgedDrawableForDensity() to PackageManager."" into nyc-dev
Vadim Tryshev [Wed, 2 Mar 2016 01:51:42 +0000 (01:51 +0000)]
Revert "Adding getManagedUserBadgedDrawableForDensity() to PackageManager."
This reverts commit
9f68f41a5866e1feb810b16c769705c10e850d5d.
Caused breakage.
Change-Id: I441737f61f6f38ed9f440211b52bbac0f74982e3
Jeff Sharkey [Wed, 2 Mar 2016 01:38:49 +0000 (18:38 -0700)]
Start unaware persistent apps after user unlocked.
Otherwise we'll never start them. In particular, this fixes NFC.
Bug:
27360562
Change-Id: I9d430b1e377e63b35060b234f585ac180a369ad2
Insun Kang [Wed, 2 Mar 2016 01:36:09 +0000 (01:36 +0000)]
Merge "Annotate Media section of framework/base" into nyc-dev
Steve McKay [Wed, 2 Mar 2016 01:33:31 +0000 (01:33 +0000)]
Merge "Fix roots filtering for move operations." into nyc-dev
Steve McKay [Tue, 1 Mar 2016 23:11:56 +0000 (15:11 -0800)]
Fix roots filtering for move operations.
Add test coverage for the Downloads case.
This was a regression to my recent cleanup of RootInfo.
Fixed logic to not exclude basically *everything* when a
directory is in the set of files to be copied.
Bug:
27303346
Change-Id: I4d5608e0d8d95448b027b20107a11a7a5e46d45e
Selim Cinek [Tue, 1 Mar 2016 20:06:57 +0000 (12:06 -0800)]
Fixed a bug where the notification texts wouldn't animate
If the texts were the same but one had an ellipsis and the
other didn't, things were not animating nicely.
Bug:
27419215
Change-Id: Iaa9611e1cf60b6fe71113b76f36ab5c24e461961
Jeff Sharkey [Wed, 2 Mar 2016 00:53:11 +0000 (00:53 +0000)]
Merge "Don't evict SharedPreferences when migrate no-op." into nyc-dev
Jeff Sharkey [Wed, 2 Mar 2016 00:52:34 +0000 (00:52 +0000)]
Merge "Make preferred activities encryption aware." into nyc-dev
Jeff Sharkey [Wed, 2 Mar 2016 00:52:20 +0000 (00:52 +0000)]
Merge "Utility to detect lock inversions in system." into nyc-dev
Vadim Tryshev [Wed, 2 Mar 2016 00:49:28 +0000 (00:49 +0000)]
Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev
Wale Ogunwale [Wed, 2 Mar 2016 00:45:02 +0000 (00:45 +0000)]
Merge "Relaunch activity resumed if it got resumed before relaunching." into nyc-dev
Vadim Tryshev [Thu, 18 Feb 2016 23:41:21 +0000 (15:41 -0800)]
Adding getManagedUserBadgedDrawableForDensity() to PackageManager.
It allows badging an image regardless of of the user (no
user id parameter). The styling for managed users is applied.
This is useful for new cases where the existing functions
wouldn't badge the icon, but we need it.
Bug:
25192539
Change-Id: I20ca2d7265cbc3a47c050a72ec1843cc0a481c74
Jeff Sharkey [Wed, 2 Mar 2016 00:38:39 +0000 (00:38 +0000)]
Merge "Sometimes to step forward, we need to go back. [2/2]" into nyc-dev
Jeff Sharkey [Wed, 2 Mar 2016 00:38:31 +0000 (00:38 +0000)]
Merge "Sometimes to step forward, we need to go back. [1/2]" into nyc-dev
Yigit Boyar [Wed, 2 Mar 2016 00:36:48 +0000 (00:36 +0000)]
Merge "Check if item is selectable before calling on click" into nyc-dev
Jeff Sharkey [Wed, 2 Mar 2016 00:36:23 +0000 (17:36 -0700)]
Sometimes to step forward, we need to go back. [2/2]
Change-Id: Iccabb95530a6e3c3950cb9a8dfe84e75354d2f5f
Lorenzo Colitti [Wed, 2 Mar 2016 00:33:41 +0000 (00:33 +0000)]
Merge "Don't pass calling contexts into static services." into nyc-dev
Jeff Sharkey [Wed, 2 Mar 2016 00:28:36 +0000 (17:28 -0700)]
Sometimes to step forward, we need to go back. [1/2]
Change-Id: Ibff95298dc2e6c09675018ad0c45506589b6312a
Yigit Boyar [Wed, 2 Mar 2016 00:09:58 +0000 (16:09 -0800)]
Check if item is selectable before calling on click
This CL fixes a bug in ListView where it might call onClick on an
un-clickable if a new touch arrives before up timeout.
We could actually consider making child position non-changable
but that will change behavior. This seems safer approach.
Bug:
27198796
Change-Id: I7b15d04efa19d1d760a294bd027f3da3aaa3a445
Doris Liu [Wed, 2 Mar 2016 00:08:28 +0000 (00:08 +0000)]
Merge "Revert "Temporarily disable AVD on RT"" into nyc-dev
John Reck [Tue, 1 Mar 2016 23:58:12 +0000 (23:58 +0000)]
Revert "Temporarily disable AVD on RT"
This reverts commit
128a36526c14d03d9585c12e808c5fb7ffd3bc3c.
Change-Id: Ibd687a9272d63feb842fba765b8b1d5165841527
John Reck [Tue, 1 Mar 2016 23:58:04 +0000 (23:58 +0000)]
Merge "Temporarily disable AVD on RT" into nyc-dev
John Reck [Tue, 1 Mar 2016 23:43:34 +0000 (15:43 -0800)]
Temporarily disable AVD on RT
Bug:
27396097
Change-Id: I44324bca96e4a3a659d7222970c7e5d635a36383
Svetoslav Ganov [Tue, 1 Mar 2016 23:42:18 +0000 (23:42 +0000)]
Merge "API for safe label to present in the UI" into nyc-dev
Anna Galusza [Tue, 1 Mar 2016 23:39:07 +0000 (23:39 +0000)]
Merge "Throw exception from SoftKeyboardController if connection is dead and declare SHOW_MODE_AUTO and SHOW_MODE_HIDDEN in AccessibilityService class. Bug:
27364143" into nyc-dev
Fyodor Kupolov [Tue, 1 Mar 2016 23:21:26 +0000 (23:21 +0000)]
Merge "Disable switching users if the user is in a call" into nyc-dev
Alan Viverette [Tue, 1 Mar 2016 23:13:41 +0000 (23:13 +0000)]
Merge "Use Holo date/time picker layouts on very small screens" into nyc-dev
Svetoslav Ganov [Tue, 1 Mar 2016 23:02:30 +0000 (23:02 +0000)]
Merge "Hide overlay windows in VR mode" into nyc-dev
Svetoslav Ganov [Tue, 1 Mar 2016 23:01:14 +0000 (15:01 -0800)]
Hide overlay windows in VR mode
bug:
26775563
Change-Id: I0e81cc64f281cd085ff642ebd93f32ceb3ad5480
Keun-young Park [Tue, 1 Mar 2016 22:59:13 +0000 (22:59 +0000)]
Merge "Revert "make isUiModeLocked, isNightModeLocked test api"" into nyc-dev
Keun-young Park [Tue, 1 Mar 2016 22:58:15 +0000 (22:58 +0000)]
Revert "make isUiModeLocked, isNightModeLocked test api"
This reverts commit
b493a7dffe1b40fd7d5c22b8ed340c76918bc56b.
Change-Id: I651b7ee5b9ca5d7fa1cde1c625bbaa585e186544
Felipe Leme [Tue, 1 Mar 2016 22:43:10 +0000 (22:43 +0000)]
Merge "Created netpolicy commands to manage UIDs blacklisted for network access while on background." into nyc-dev
Svetoslav Ganov [Tue, 1 Mar 2016 22:12:43 +0000 (14:12 -0800)]
API for safe label to present in the UI
bug:
23531798
Change-Id: Ic3e0ed3db11445dbc5e562ca1a91b181ec5f2553
Steve McKay [Tue, 1 Mar 2016 22:30:12 +0000 (22:30 +0000)]
Merge "Ensure directory names are aligned correctly..." into nyc-dev
Jeff Sharkey [Tue, 1 Mar 2016 22:25:03 +0000 (15:25 -0700)]
Don't evict SharedPreferences when migrate no-op.
When calling migrateSharedPreferencesFrom(), only evict the in-memory
caches when we actually moved files around.
Bug:
27387346
Change-Id: I4fb534e55c0d3df7c574f18d2a853ef824635b8e
Jeff Sharkey [Tue, 1 Mar 2016 22:15:55 +0000 (15:15 -0700)]
Make preferred activities encryption aware.
Not all built-in apps are encryption aware, so match them all when
setting up preferred activities.
Bug:
27429841
Change-Id: I0fd2195714fac95d031813bab73125a5c7b6c81a
Dongwon Kang [Tue, 1 Mar 2016 22:11:43 +0000 (22:11 +0000)]
Merge "TIF: Address API review comments" into nyc-dev
Alan Viverette [Tue, 1 Mar 2016 21:48:04 +0000 (16:48 -0500)]
Use Holo date/time picker layouts on very small screens
If the screen is smaller than "small" then use the Holo picker layouts.
Unifies the SavedState between delegates so that we can seamlessly
transition between them during configuration changes. Pushes the
DatePickerSpinnerDelegate up to the same level as the calendar delegate.
Bug:
27239893
Change-Id: Ida4dc2748d38bd766ae93d12aef15e963921939c
George Mount [Tue, 1 Mar 2016 21:41:44 +0000 (21:41 +0000)]
Merge "Clear child fragment manager after it is destroyed." into nyc-dev
George Mount [Tue, 1 Mar 2016 21:40:53 +0000 (21:40 +0000)]
Merge "Ensure that fragments are created in added order." into nyc-dev
Felipe Leme [Tue, 1 Mar 2016 21:40:31 +0000 (13:40 -0800)]
Created netpolicy commands to manage UIDs blacklisted for network access
while on background.
These commands will be used primarily in the CTS tests:
- list restrict-background-blacklist
- add restrict-background-blacklist UID
- remove restrict-background-blacklist UID
BUG:
27432317
Change-Id: Ie1148dcabbb2481ccd39659a813fac3776f84e3b
Steve McKay [Tue, 1 Mar 2016 21:39:25 +0000 (21:39 +0000)]
Merge "Don't assert against Recents title." into nyc-dev
Steve McKay [Tue, 1 Mar 2016 20:57:44 +0000 (12:57 -0800)]
Don't assert against Recents title.
It was causing a failure.
Bug:
27383076
Change-Id: Ieb4693783831443e05f32333c181371b0eb4fb93
Michael Wright [Tue, 1 Mar 2016 21:32:05 +0000 (21:32 +0000)]
Merge "Show error message when pairing fails in SUW." into nyc-dev
Chris Wren [Tue, 1 Mar 2016 21:02:49 +0000 (21:02 +0000)]
Merge "Revert "add all those great comments from the other file."" into nyc-dev
Chris Wren [Tue, 1 Mar 2016 21:02:21 +0000 (21:02 +0000)]
Revert "add all those great comments from the other file."
This reverts commit
72a4bbc694aef402a9a3fc1656d8bf26decaeb70.
Change-Id: Ib351cdd85b8daf17fecc23a3851dda9fb89e477c
Dianne Hackborn [Tue, 1 Mar 2016 20:57:01 +0000 (20:57 +0000)]
Merge "Fix issue #
27317952: PendingIntent.getIntent() should be protected" into nyc-dev
Anna Galusza [Mon, 29 Feb 2016 23:39:08 +0000 (15:39 -0800)]
Throw exception from SoftKeyboardController if connection is dead and declare
SHOW_MODE_AUTO and SHOW_MODE_HIDDEN in AccessibilityService class.
Bug:
27364143
Change-Id: I02c23fbfab1eae8b2a155b1d9c3857e4eb6addb1
Todd Kennedy [Tue, 1 Mar 2016 20:39:57 +0000 (20:39 +0000)]
Merge "Revert "Revert "Remove deprecated methods / classes""" into nyc-dev
Wale Ogunwale [Tue, 1 Mar 2016 20:34:49 +0000 (20:34 +0000)]
Merge "Changed logging format of lost windows to reduce confusion." into nyc-dev
Wale Ogunwale [Tue, 1 Mar 2016 20:34:11 +0000 (20:34 +0000)]
Merge "Add activity onStop lifecycle to event logs." into nyc-dev
Robin Lee [Tue, 1 Mar 2016 20:25:18 +0000 (20:25 +0000)]
Merge "More sensible return code for Credentials.deleteAll" into nyc-dev
Jason Monk [Tue, 1 Mar 2016 20:10:22 +0000 (20:10 +0000)]
Merge "Fix difference in icon size for quick QS" into nyc-dev
Robin Lee [Tue, 1 Mar 2016 20:09:44 +0000 (20:09 +0000)]
Merge "ConnectivityService: listen to USER_UNLOCKED too" into nyc-dev
Jakub Pawlowski [Tue, 1 Mar 2016 20:04:33 +0000 (20:04 +0000)]
Merge "Hide android.bluetooth.OobData" into nyc-dev
Adrian Roos [Tue, 1 Mar 2016 20:00:51 +0000 (20:00 +0000)]
Merge "Improve mergeability of metrics_constants.proto" into nyc-dev
Jason Monk [Tue, 1 Mar 2016 20:00:16 +0000 (15:00 -0500)]
Fix difference in icon size for quick QS
Bug:
27371482
Change-Id: I7c1316bf3b3ff6dfde0a92a6c8b9599c2f203503
Adrian Roos [Thu, 25 Feb 2016 19:58:32 +0000 (11:58 -0800)]
Improve mergeability of metrics_constants.proto
Change-Id: I6f964d85b5d1b85a04bc8ac2a87453455be93719
Winson [Tue, 1 Mar 2016 19:56:30 +0000 (11:56 -0800)]
Fixing regression in creating dismiss descriptions.
Bug:
27411256
Change-Id: I39f56257544d593838349049208fe59f551100eb
Winson Chung [Tue, 1 Mar 2016 19:57:03 +0000 (19:57 +0000)]
Merge "Skip animation in error case, log for further investigation." into nyc-dev
Abhijith Shastry [Tue, 1 Mar 2016 19:56:05 +0000 (19:56 +0000)]
Merge "Add deprecated annotation to launchManageBlockedNumbersActivity API." into nyc-dev
Jeff Sharkey [Tue, 1 Mar 2016 19:55:12 +0000 (19:55 +0000)]
Merge "Suppress StopInfo exception based on target API." into nyc-dev
Steve McKay [Tue, 1 Mar 2016 19:26:00 +0000 (11:26 -0800)]
Ensure directory names are aligned correctly...
In list view...and don't show dir dates, even when present.
In fact, no details on folders at all when in list view.
Also improve layout of files without details (if they exist).
Bug:
27406730
Change-Id: Ida4b5f99666c4a145ca98a3c15c480e59a76b4a6
Nimrod Gileadi [Mon, 29 Feb 2016 12:33:13 +0000 (12:33 +0000)]
Close InputStream in BatteryStatsHelper
Bug:
17760659
Bug:
27376093
Change-Id: I5e6471f73b3258067fb670a4b66ddc51be62b6ec
(cherry picked from commit
e618b53081d9a173305b7c72cab4c2ed6ca2dcec)
Chris Wren [Tue, 1 Mar 2016 19:38:44 +0000 (19:38 +0000)]
Merge "add all those great comments from the other file." into nyc-dev
Chris Wren [Tue, 1 Mar 2016 19:31:56 +0000 (14:31 -0500)]
add all those great comments from the other file.
Bug:
27429645
Change-Id: Ice3b1d01f27fa872191cd07f54b55a51733f77a1
Jason Monk [Tue, 1 Mar 2016 19:26:55 +0000 (19:26 +0000)]
Merge "Handle density changes in QS" into nyc-dev