OSDN Git Service

Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times."...
authorManu Cornet <manucornet@google.com>
Thu, 16 Feb 2017 03:13:14 +0000 (03:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Feb 2017 03:13:14 +0000 (03:13 +0000)
commit0c09549ef45bf4a9ec3f6c83d2511023a4c67131
tree530e38e5d1ae9ddb102367db65dd30ec2ebf1885
parentdbf6f9263d5e2fd44f4e9ebd7831712014ad8178
parente0e08f3f418420a94ef9d507fdd5195dfe2da082
Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev
am: e0e08f3f41

Change-Id: Iaeee64f2a6954be8560412f60f838e2483be01f0
core/java/android/provider/Settings.java
packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java