| commit | 550e1c9a6b804dedb7b3d185fcbd40cdd0f257ee | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue May 02 16:00:52 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 02 16:00:56 2017 +0000 |
| tree | 2d8a6e12bca1bc6497ff3414cd6a4fa7e8b40a47 | |
| parent | 9967a4d3aff57a740b204efc8959bcdc89de8ce1 [diff] | |
| parent | 239bef360f05e5b96bf441a868b01aa7697ed70b [diff] |
Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am: a686345759 am: a399705286 -s ours" into oc-dev