OSDN Git Service

Merge "Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerS...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 2 May 2017 16:10:47 +0000 (16:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 2 May 2017 16:10:51 +0000 (16:10 +0000)
commit17d766c917bfa29c196b7997647108f2f9b6a282
tree86aa374be2d86159dea0be85ced08804cf2e1982
parentedae7a8e1c1f50f2dcc49443dc3df62ed13381da
parent8a22ad86ea3dc4fccc2ca40bf6208ab071ca6a55
Merge "Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am: a686345759 am: a399705286  -s ours" into oc-dev am: 550e1c9a6b" into oc-dev-plus-aosp