summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/15/changes
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-05-02 16:10:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-05-02 16:10:51 +0000
commit17d766c917bfa29c196b7997647108f2f9b6a282 (patch)
tree86aa374be2d86159dea0be85ced08804cf2e1982 /docs/html/sdk/api_diff/15/changes
parentedae7a8e1c1f50f2dcc49443dc3df62ed13381da (diff)
parent8a22ad86ea3dc4fccc2ca40bf6208ab071ca6a55 (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
Diffstat (limited to 'docs/html/sdk/api_diff/15/changes')
0 files changed, 0 insertions, 0 deletions