summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/20
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2016-05-27 17:37:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-27 17:37:42 +0000
commitf43c82ba1512c3bdac1bcf3c992d328597596bc5 (patch)
treeece3e00cd37852e10c55368a36eccef4ff06ed75 /docs/html/sdk/api_diff/20
parent071f2cf9ca495023fb1b52f40f784117022c0dd0 (diff)
parent4f34e793b3359b9b880f539680a43a7d937a1983 (diff)
DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af -s ours am: 88c9eae886 am: 1fa817c057 am: 040cf14047 am: 0905c8f398 -s ours am: d39c0a8d77 am: 50aa0324c9
am: 4f34e793b3 -s ours * commit '4f34e793b3359b9b880f539680a43a7d937a1983': DO NOT MERGE : backport of backup transport whitelist Change-Id: I823126bff0c3bd5e8bd38988634d5d68fdcb57b4
Diffstat (limited to 'docs/html/sdk/api_diff/20')
0 files changed, 0 insertions, 0 deletions