| commit | 17d766c917bfa29c196b7997647108f2f9b6a282 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue May 02 16:10:47 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 02 16:10:51 2017 +0000 |
| tree | 86aa374be2d86159dea0be85ced08804cf2e1982 | |
| parent | edae7a8e1c1f50f2dcc49443dc3df62ed13381da [diff] | |
| parent | 8a22ad86ea3dc4fccc2ca40bf6208ab071ca6a55 [diff] |
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