OSDN Git Service

Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService...
authorErik Wolsheimer <ewol@google.com>
Tue, 2 May 2017 16:10:00 +0000 (16:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 May 2017 16:10:00 +0000 (16:10 +0000)
commit8a22ad86ea3dc4fccc2ca40bf6208ab071ca6a55
tree86aa374be2d86159dea0be85ced08804cf2e1982
parent941eae0a846323c1982324a4ab88e863a8a64c67
parent550e1c9a6b804dedb7b3d185fcbd40cdd0f257ee
Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am: a686345759 am: a399705286  -s ours" into oc-dev
am: 550e1c9a6b

Change-Id: Ie3ec9c7b8aee293f79cccde97b197c8c77d63281