| commit | 8a22ad86ea3dc4fccc2ca40bf6208ab071ca6a55 | [log] [tgz] |
|---|---|---|
| author | Erik Wolsheimer <ewol@google.com> | Tue May 02 16:10:00 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 02 16:10:00 2017 +0000 |
| tree | 86aa374be2d86159dea0be85ced08804cf2e1982 | |
| parent | 941eae0a846323c1982324a4ab88e863a8a64c67 [diff] | |
| parent | 550e1c9a6b804dedb7b3d185fcbd40cdd0f257ee [diff] |
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