OSDN Git Service
John Reck [Wed, 21 Mar 2018 22:12:59 +0000 (22:12 +0000)]
Merge "Fix wrong SafeUnref type" into pi-dev
am:
b09f2b5926
Change-Id: Ia85990286f15d98683518b61cfc57e8ea61674fc
Yueming Wang [Wed, 21 Mar 2018 22:04:06 +0000 (22:04 +0000)]
Merge "Revert "Logging: Bluetooth Enabled"" am:
21a9ebeb6c
am:
4871761e31
Change-Id: I80622bf93288cf21defbf3a75e698c99c1a1717f
Yi Jin [Wed, 21 Mar 2018 21:49:17 +0000 (21:49 +0000)]
Merge "Remove am/wm.proto which is redundant. The naming convention is defined in core/proto/README.md" into pi-dev
am:
32ca41d028
Change-Id: I73b1ed0210f01ad6bf81089fef408765f34426a1
Malcolm Chen [Wed, 21 Mar 2018 21:39:59 +0000 (21:39 +0000)]
Merge "By default, turn on signal strength update in power save mode." into pi-dev
am:
b1223f4525
Change-Id: I209d99add22a23329537d3474b7f4a0565b7a8b2
Nathan Harold [Wed, 21 Mar 2018 21:35:13 +0000 (21:35 +0000)]
Merge changes I4c26aea7,I79911434 into pi-dev
am:
095b9e8e1c -s ours
Change-Id: I19626bf87d31c759939c6aafc42ae679f6cb18e4
TreeHugger Robot [Wed, 21 Mar 2018 21:34:10 +0000 (21:34 +0000)]
Merge "Fix wrong SafeUnref type" into pi-dev
Brad Ebinger [Wed, 21 Mar 2018 21:32:06 +0000 (21:32 +0000)]
Merge "Define phone process as a constant" into pi-dev
am:
025cb0c392 -s ours
Change-Id: Iab4ce6f2b1cc069d1aa00b0865a67e191131fb9e
TreeHugger Robot [Wed, 21 Mar 2018 21:24:19 +0000 (21:24 +0000)]
Merge "Remove am/wm.proto which is redundant. The naming convention is defined in core/proto/README.md" into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 21:11:39 +0000 (21:11 +0000)]
Merge "By default, turn on signal strength update in power save mode." into pi-dev
Brad Ebinger [Wed, 21 Mar 2018 21:10:46 +0000 (21:10 +0000)]
Define phone process as a constant
am:
1078b3a36b -s ours
Change-Id: I36a9ef7016c3ea684bf8a0a02ff446727f3074ee
Yao Chen [Wed, 21 Mar 2018 21:06:54 +0000 (21:06 +0000)]
Merge "Enable sanitizer on statsd eng build." into pi-dev
am:
dc5677336c
Change-Id: I4418b07d55e01eabfca0aabd6a54ea79ca456370
Yueming Wang [Wed, 21 Mar 2018 21:05:59 +0000 (21:05 +0000)]
Merge "Revert "Logging: Bluetooth Enabled""
am:
21a9ebeb6c
Change-Id: I0f4649369bf3d4c92ef487eaa471ca9481185478
Lujiang Xue [Wed, 21 Mar 2018 21:00:11 +0000 (21:00 +0000)]
Merge "add car volume dialog" into pi-dev
am:
f2e00697a5
Change-Id: Idf420b47057eda6c759f40e9ce9ed9b7b55ec730
Nathan Harold [Wed, 21 Mar 2018 20:59:02 +0000 (20:59 +0000)]
Merge changes I4c26aea7,I79911434 into pi-dev
* changes:
Check mOwnedByTransform to avoid DELSA on SPI
Expose add/removeAddress for IpSecInterfaces
Adrian Roos [Wed, 21 Mar 2018 20:46:51 +0000 (20:46 +0000)]
Merge "Screenshot: extend scrim under cutout" into pi-dev
am:
113f9f85f4
Change-Id: If37d3ceb5c98c85e9d2b4aae6dd27fe7151bfc9c
Brad Ebinger [Wed, 21 Mar 2018 20:38:00 +0000 (20:38 +0000)]
Merge "Define phone process as a constant" into pi-dev
nharold [Wed, 21 Mar 2018 20:37:59 +0000 (20:37 +0000)]
Merge "Add NonNull Annotations To IpSec API Surface" am:
baa4bf51c1
am:
08949e354f
Change-Id: I1aa2077978eba9e13586aeb4501769e2dd42728a
Christopher Tate [Wed, 21 Mar 2018 20:32:22 +0000 (20:32 +0000)]
Merge "Suppress all background-state services in user-forced app standby" into pi-dev
am:
431cd97bd8
Change-Id: I0d26a1eabe7d4ca6a9922bc7dc7f30488b5ba8d0
nharold [Wed, 21 Mar 2018 20:28:55 +0000 (20:28 +0000)]
Merge "Add NonNull Annotations To IpSec API Surface"
am:
baa4bf51c1
Change-Id: I1393526aca627b430868816a83c8a40452521fc2
Lenka Trochtova [Wed, 21 Mar 2018 20:13:51 +0000 (20:13 +0000)]
Merge "Return a boolean from the mandatory backup transport setter." into pi-dev
am:
2f81559d29
Change-Id: Ibb77d5f16312f03504e7ced961b92e48f37342bc
TreeHugger Robot [Wed, 21 Mar 2018 20:09:10 +0000 (20:09 +0000)]
Merge "Enable sanitizer on statsd eng build." into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 20:07:41 +0000 (20:07 +0000)]
Merge "add car volume dialog" into pi-dev
Jovana Knezevic [Wed, 21 Mar 2018 20:07:41 +0000 (20:07 +0000)]
Merge "Adding UserManagerHelper class to SettingsLib." into pi-dev
am:
c7034f7ab1
Change-Id: Ief0abc0585a1b929a45ea78ef5264419f89e9caf
Christopher Tate [Wed, 21 Mar 2018 20:03:08 +0000 (20:03 +0000)]
Merge "Document Job Scheduler internal "calling" vs "source" package" into pi-dev
am:
1948f20312
Change-Id: Ie63cad3619772af031b329e643ea499f1adfcabb
Bryce Lee [Wed, 21 Mar 2018 19:59:01 +0000 (19:59 +0000)]
Merge "Ignore non-existent displays in #topRunningActivityLocked." into pi-dev
am:
3ebf5e3507
Change-Id: Ib9213703a04f4b6cbf483b2fb3a62b88531d3adc
Treehugger Robot [Wed, 21 Mar 2018 19:55:58 +0000 (19:55 +0000)]
Merge "Revert "Logging: Bluetooth Enabled""
Brad Ebinger [Wed, 21 Mar 2018 19:54:46 +0000 (19:54 +0000)]
Merge "Added Locking for MmTelFeature" into pi-dev
am:
fb241e2250 -s ours
Change-Id: I0cb8337a5d2e02f2d0e9003b841fd9fe4aef8ebd
Winson Chung [Wed, 21 Mar 2018 19:51:44 +0000 (19:51 +0000)]
Merge "Fix issue with slippery state for quickstep button case." into pi-dev
am:
d0bf944c3d
Change-Id: Id6e012c28b1d3e5616650ca6ebd30c5d5077ffbf
TreeHugger Robot [Wed, 21 Mar 2018 19:50:40 +0000 (19:50 +0000)]
Merge "Screenshot: extend scrim under cutout" into pi-dev
Chavi Weingarten [Wed, 21 Mar 2018 19:48:49 +0000 (19:48 +0000)]
Merge "Don't add stopping apps in relaunch based on stopped flag." into pi-dev
am:
ab762775d5
Change-Id: Id3d1d73a691fdfd243315645d5dca552a3cec3b9
TreeHugger Robot [Wed, 21 Mar 2018 19:45:59 +0000 (19:45 +0000)]
Merge "Suppress all background-state services in user-forced app standby" into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 19:34:52 +0000 (19:34 +0000)]
Merge "Return a boolean from the mandatory backup transport setter." into pi-dev
Jovana Knezevic [Wed, 21 Mar 2018 19:34:32 +0000 (19:34 +0000)]
Merge "Adding UserManagerHelper class to SettingsLib." into pi-dev
Lei Yu [Wed, 21 Mar 2018 19:33:05 +0000 (19:33 +0000)]
Merge "Add metric ACTION_ANOMALY_TRIGGERED" into pi-dev
am:
8e861350de
Change-Id: I3ea6f73962fec662c94a7cd2fa5efdf3f9739a1d
TreeHugger Robot [Wed, 21 Mar 2018 19:12:14 +0000 (19:12 +0000)]
Merge "Document Job Scheduler internal "calling" vs "source" package" into pi-dev
Bryce Lee [Wed, 21 Mar 2018 19:01:36 +0000 (19:01 +0000)]
Merge "Ignore non-existent displays in #topRunningActivityLocked." into pi-dev
Brad Ebinger [Wed, 21 Mar 2018 18:56:00 +0000 (18:56 +0000)]
Merge "Added Locking for MmTelFeature" into pi-dev
Lucas Dupin [Wed, 21 Mar 2018 18:52:23 +0000 (18:52 +0000)]
Merge "Renamed config_dozeAfterScreenOff" into pi-dev
am:
425812c8b4
Change-Id: Idbcdb70caeddd08db6246ea79d554aa8fb65bf54
nharold [Wed, 21 Mar 2018 18:49:44 +0000 (18:49 +0000)]
Merge "Add NonNull Annotations To IpSec API Surface"
Winson Chung [Wed, 21 Mar 2018 18:47:41 +0000 (18:47 +0000)]
Merge "Fix issue with slippery state for quickstep button case." into pi-dev
Andrew Sapperstein [Wed, 21 Mar 2018 18:39:12 +0000 (18:39 +0000)]
Merge "Update material_deep_teal_500 to #008577." into pi-dev
am:
74d9b14f21
Change-Id: Ia8bb80846588b20da5957b6393fb216afed42435
Beverly [Wed, 21 Mar 2018 18:31:47 +0000 (18:31 +0000)]
Merge "Category message is sufficient for message notif" into pi-dev
am:
b24d84b222
Change-Id: I5502cade1ec859215f76d29966f0663f387cc433
Chavi Weingarten [Wed, 21 Mar 2018 18:30:13 +0000 (18:30 +0000)]
Merge "Don't add stopping apps in relaunch based on stopped flag." into pi-dev
Adrian Roos [Wed, 21 Mar 2018 18:29:12 +0000 (18:29 +0000)]
Merge "Preserve letterbox while dragResizing" into pi-dev
am:
2dae40bfe6
Change-Id: I7756f489afd1d26d63438672d599bfbb0b415bdb
Fyodor Kupolov [Wed, 21 Mar 2018 18:25:44 +0000 (18:25 +0000)]
Merge "Include additional information in the dumpsys" into pi-dev
am:
38e09dd7e1
Change-Id: I3dd0f79193cdb71b46ff9d4477d431ee6a703fb3
Yueming Wang [Wed, 21 Mar 2018 18:20:34 +0000 (18:20 +0000)]
Revert "Logging: Bluetooth Enabled"
This reverts commit
f336d1e9cf8b48fe73ad8527365d5286d673ffba.
Reason for revert: Reverting this CL as it causes several build breakages in git_stage-aosp-master
Change-Id: I4a29f7313857a561452c01fb331accbf59c64a72
Tim Volodine [Wed, 21 Mar 2018 18:15:52 +0000 (18:15 +0000)]
Merge "WebView Tracing API: remove LARGE_BUFFER, make RECORD_CONTINUOUSLY the default mode" into pi-dev
am:
158a18108b
Change-Id: I557685531c2d80fd3eb4792d5b8aacffd9ae7d2e
TreeHugger Robot [Wed, 21 Mar 2018 18:05:21 +0000 (18:05 +0000)]
Merge "Add metric ACTION_ANOMALY_TRIGGERED" into pi-dev
Lucas Dupin [Wed, 21 Mar 2018 18:04:49 +0000 (18:04 +0000)]
Merge "Renamed config_dozeAfterScreenOff" into pi-dev
Yao Chen [Wed, 21 Mar 2018 18:00:53 +0000 (11:00 -0700)]
Enable sanitizer on statsd eng build.
Bug:
74946342
Test: manual
Change-Id: I287def435d077670814db50e4d8398ecee539b74
Svet Ganov [Wed, 21 Mar 2018 17:59:09 +0000 (17:59 +0000)]
Merge "Make autofill save UI RTL compliant" into pi-dev
am:
de51e0c615
Change-Id: I66dcaea04f2867f8984bfc58bd58df567bbb4b45
Android Build Merger (Role) [Wed, 21 Mar 2018 17:54:22 +0000 (17:54 +0000)]
Merge "Merge "Some Slices API refinement" into pi-dev am:
1543171d3e" into pi-dev-plus-aosp
John Reck [Wed, 21 Mar 2018 17:50:01 +0000 (10:50 -0700)]
Fix wrong SafeUnref type
Test: builds
Change-Id: I5a03551c408736722802ba0e8692c3d85e375112
Fixes:
76029886
Tej Singh [Wed, 21 Mar 2018 17:49:44 +0000 (17:49 +0000)]
Merge "Logging: Bluetooth Enabled" am:
8173db40c3
am:
02a75203a0
Change-Id: I72a3a8dc70d9baa18d93aa62d94b3c3b7fac4c76
Jason Monk [Wed, 21 Mar 2018 17:45:59 +0000 (17:45 +0000)]
Merge "Some Slices API refinement" into pi-dev
am:
1543171d3e
Change-Id: Ib921eac77b9154800aa784ec3d3f4846f788a9a7
TreeHugger Robot [Wed, 21 Mar 2018 17:45:25 +0000 (17:45 +0000)]
Merge "Update material_deep_teal_500 to #008577." into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 17:43:40 +0000 (17:43 +0000)]
Merge "Category message is sufficient for message notif" into pi-dev
Tej Singh [Wed, 21 Mar 2018 17:41:24 +0000 (17:41 +0000)]
Merge "Logging: Bluetooth Enabled"
am:
8173db40c3
Change-Id: I41cc9b255e777d137941aa305cbcb5d7de376b10
Benedict Wong [Wed, 21 Mar 2018 17:39:56 +0000 (17:39 +0000)]
Merge "Added implementation for VTI add/remove address" into pi-dev
am:
f801b8ae69 -s ours
Change-Id: I1f77872860e705606ba9f0c7f95200ee5bdbe499
Benedict Wong [Wed, 21 Mar 2018 17:34:08 +0000 (17:34 +0000)]
Merge "Add support for auth-only transforms" into pi-dev
am:
d7582684b6 -s ours
Change-Id: Id0bffdfbf90c4780108702bcd98c48d458292444
Adrian Roos [Wed, 21 Mar 2018 17:33:27 +0000 (17:33 +0000)]
Merge "Preserve letterbox while dragResizing" into pi-dev
Chavi Weingarten [Wed, 21 Mar 2018 17:30:32 +0000 (17:30 +0000)]
Merge "Merge transactions to parent if layer is going to be removed." into pi-dev
am:
c3a808d9cc
Change-Id: Ia2dbd9ead5de401739c633f5ea5942efac223f8a
Fyodor Kupolov [Wed, 21 Mar 2018 17:25:28 +0000 (17:25 +0000)]
Merge "Include additional information in the dumpsys" into pi-dev
Adrian Roos [Wed, 21 Mar 2018 17:25:27 +0000 (17:25 +0000)]
Merge "DisplayCutout: Add back always resource" into pi-dev
am:
0eb46d80d5
Change-Id: I879b3c7ec25da9bf55227e63e9d690f6d162db6e
Leon Scroggins [Wed, 21 Mar 2018 17:20:16 +0000 (17:20 +0000)]
Merge "Report native allocation size of AnimatedImageDrawable" into pi-dev
am:
d848f75f99
Change-Id: Ifc765e6ba33dcd7152e850ddbe88fc6b458f75af
David Brazdil [Wed, 21 Mar 2018 17:15:55 +0000 (17:15 +0000)]
Merge "Add new hidden API uses to light greylist" into pi-dev
am:
f344b3ead5
Change-Id: I011ff07281e1af5dcc89012e497b6183be792444
TreeHugger Robot [Wed, 21 Mar 2018 17:14:47 +0000 (17:14 +0000)]
Merge "WebView Tracing API: remove LARGE_BUFFER, make RECORD_CONTINUOUSLY the default mode" into pi-dev
Tim Volodine [Mon, 19 Mar 2018 20:07:23 +0000 (20:07 +0000)]
WebView Tracing API: remove LARGE_BUFFER, make RECORD_CONTINUOUSLY the default mode
This patch:
- remove the RECORD_UNTIL_FULL_LARGE_BUFFER tracing option, because
this does not appear really useful in the production setting as
the buffer size limit exceeds the device memory and can grow
uncontrollably large.
- make RECORD_CONTINUOUSLY the default mode for tracing, to make
sure the least memory is used by default (typically 4x less than the
previous default RECORD_UNTIL_FULL).
- add some missing IntDef values (to make them match with the constants)
BUG:
63750258
Test: CTS
Change-Id: Ib3698273dee776ebc7a8388fc1bd8c80255e3b63
TreeHugger Robot [Wed, 21 Mar 2018 17:09:25 +0000 (17:09 +0000)]
Merge "Make autofill save UI RTL compliant" into pi-dev
Nathan Harold [Sat, 17 Mar 2018 00:27:30 +0000 (17:27 -0700)]
Add NonNull Annotations To IpSec API Surface
This CL adds NonNull annotations to a large
number of method returns and parameters as
part of API council feedback.
Bug:
72473424
Test: compilation (docstring-only change)
Change-Id: I2f865dde56fe12116c461ad98e9460bf1802ce18
TreeHugger Robot [Wed, 21 Mar 2018 17:06:40 +0000 (17:06 +0000)]
Merge "Some Slices API refinement" into pi-dev
Benedict Wong [Wed, 21 Mar 2018 17:03:52 +0000 (17:03 +0000)]
Merge "Added implementation for VTI add/remove address" into pi-dev
Benedict Wong [Wed, 21 Mar 2018 17:03:48 +0000 (17:03 +0000)]
Merge "Add support for auth-only transforms" into pi-dev
Chavi Weingarten [Wed, 21 Mar 2018 17:02:09 +0000 (17:02 +0000)]
Merge "Merge transactions to parent if layer is going to be removed." into pi-dev
Brad Ebinger [Wed, 14 Mar 2018 23:14:55 +0000 (16:14 -0700)]
Define phone process as a constant
Test: Manual
Bug:
72645729
Merged-In: I8086e4efa15d74bd61c55b72c7b14be4705fcd58
Change-Id: If07728ea2cc0128113ebe947a154f80ff45a7d9d
Beverly [Wed, 21 Mar 2018 16:56:27 +0000 (16:56 +0000)]
Merge "Get rid of upperbound on wireless charging anim" into pi-dev
am:
34730143de
Change-Id: Ib666b463571c8498cea7030af6a38d3483dbf361
TreeHugger Robot [Wed, 21 Mar 2018 16:50:32 +0000 (16:50 +0000)]
Merge "DisplayCutout: Add back always resource" into pi-dev
Leon Scroggins [Wed, 21 Mar 2018 16:48:19 +0000 (16:48 +0000)]
Merge "Report native allocation size of AnimatedImageDrawable" into pi-dev
Salvador Martinez [Wed, 21 Mar 2018 16:46:46 +0000 (16:46 +0000)]
Merge "Update logging util to not crash on null" into pi-dev
am:
d5eab8b668
Change-Id: Ieb5b3590e42d99c59592812afdbf9b22c8779fe9
Jason Monk [Wed, 21 Mar 2018 16:37:57 +0000 (16:37 +0000)]
Merge "UsageEvents for slices pinning" into pi-dev
am:
17d3b47e20
Change-Id: I559072719451cd2cff5b49f7d89c3ee92b995ac1
Mike Digman [Wed, 21 Mar 2018 16:32:56 +0000 (16:32 +0000)]
Merge "Ensure rotate disable2 flag can be set on boot" into pi-dev
am:
65808f3210
Change-Id: I094118c829df08c7dbd6db7a1bf38faedf013450
David Brazdil [Wed, 21 Mar 2018 16:28:17 +0000 (16:28 +0000)]
Merge "Add new hidden API uses to light greylist" into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 16:26:12 +0000 (16:26 +0000)]
Merge "Get rid of upperbound on wireless charging anim" into pi-dev
Treehugger Robot [Wed, 21 Mar 2018 16:25:27 +0000 (16:25 +0000)]
Merge "Logging: Bluetooth Enabled"
Mike Digman [Wed, 21 Mar 2018 16:25:25 +0000 (16:25 +0000)]
Merge "Update IME/keyboard switcher navbar icon to GM" into pi-dev
am:
7ae1fbb496
Change-Id: I109ee9e0efb3cc07742ceb8a845c3c8ea6efc602
Salvador Martinez [Wed, 21 Mar 2018 16:23:26 +0000 (16:23 +0000)]
Merge "Update logging util to not crash on null" into pi-dev
Bryce Lee [Wed, 21 Mar 2018 16:20:38 +0000 (16:20 +0000)]
Merge "Distinguish between bringing stack to front and delivering to top." into pi-dev
am:
696eb17cc8
Change-Id: Ic19f25a38e1b8ba35cfa4629645c785cad1d6492
Bryce Lee [Wed, 21 Mar 2018 16:14:56 +0000 (16:14 +0000)]
Merge "Add unit test for ActivityStackSupervisor#testApplySleepTokensLocked." into pi-dev
am:
c4bb25c299
Change-Id: Ic9daf100424371530b3fa6a855f1ebd1e527faea
Bryce Lee [Tue, 20 Mar 2018 20:58:53 +0000 (13:58 -0700)]
Ignore non-existent displays in #topRunningActivityLocked.
Previous changes aimed at driving display creation through
ActivityManagerService. However, there are still cases where
WindowManagerService will encounter the display first (such as add
window). A subsequent changelist enabled this out of band creation.
As a result the WindowManagerService and ActivityManagerService can
still have different lists of displays. This mismatch leads to
#topRunningActivityLocked processing null ActivityDisplays.
This changelist skips over displays not yet encountered by
ActivityManagerService in #topRunningActivityLocked. Such displays
have no stacks and therefore no activities that could be the top
running activity.
Test: atest FrameworksServicesTests:com.android.server.am.ActivityStackSupervisorTests#testTopRunningActivityLockedWithNonExistentDisplay
Fixes:
74593710
Change-Id: I316e5305f7ce233a04ecf18d605eebdf723b0920
TreeHugger Robot [Wed, 21 Mar 2018 16:07:32 +0000 (16:07 +0000)]
Merge "UsageEvents for slices pinning" into pi-dev
Rubin Xu [Wed, 21 Mar 2018 16:03:22 +0000 (16:03 +0000)]
Merge "Restore state if password change fails" into pi-dev
am:
655877cd84
Change-Id: Ide07b138b75ea7624362b20c87d4e1d580cc6270
Mike Digman [Wed, 21 Mar 2018 16:03:00 +0000 (16:03 +0000)]
Merge "Ensure rotate disable2 flag can be set on boot" into pi-dev
Mike Digman [Wed, 21 Mar 2018 16:02:45 +0000 (16:02 +0000)]
Merge "Update IME/keyboard switcher navbar icon to GM" into pi-dev
Bryce Lee [Wed, 21 Mar 2018 15:58:08 +0000 (15:58 +0000)]
Merge "Distinguish between bringing stack to front and delivering to top." into pi-dev
Bryce Lee [Wed, 21 Mar 2018 15:57:48 +0000 (15:57 +0000)]
Merge "Add unit test for ActivityStackSupervisor#testApplySleepTokensLocked." into pi-dev
David Brazdil [Tue, 20 Mar 2018 19:48:01 +0000 (19:48 +0000)]
Add new hidden API uses to light greylist
From common apps.
Bug:
64382372
Bug:
74430927
Test: make
Change-Id: I81c38a78fcdc7c33f54cd25823b301ba29638019
Amin Shaikh [Wed, 21 Mar 2018 15:51:22 +0000 (15:51 +0000)]
Merge "Update QS customizer add tiles string." into pi-dev
am:
323e41c6ae
Change-Id: I2533b051f6da1cdf7757eb5c44ca291f19076b61
Evan Laird [Wed, 21 Mar 2018 15:46:40 +0000 (15:46 +0000)]
Merge "Intercept touches in the emulated DisplayCutout" into pi-dev
am:
f40c8e074f
Change-Id: If95a878f0e34f1e6ffd79f209f445cfb2f42132b
TreeHugger Robot [Wed, 21 Mar 2018 15:41:34 +0000 (15:41 +0000)]
Merge "Restore state if password change fails" into pi-dev
Annie Meng [Wed, 21 Mar 2018 15:38:24 +0000 (15:38 +0000)]
Merge "DO NOT MERGE Update references to backup/restore agent timeouts" into pi-dev
am:
40bf2b0fd1
Change-Id: Ic5857e9cababce0f3d2f4eb586e2befe1b59bdd4
OSDN Git Service
