| commit | f381e092b8b7644c64792d77ba0b8f197a7e531d | [log] [tgz] |
|---|---|---|
| author | Erik Wolsheimer <ewol@google.com> | Tue May 02 16:30:43 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 02 16:30:43 2017 +0000 |
| tree | ff27fbd7447b9538c71e369da0b3ca5cb63b72ce | |
| parent | d07bdd37dd4e7bef54a74146c389e6e2ffb9e08f [diff] | |
| parent | 17d766c917bfa29c196b7997647108f2f9b6a282 [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 am: 17d766c917 Change-Id: Ie501008a3696b02e836cf92c0671b3c160b1ef24