summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/15
diff options
context:
space:
mode:
authorChad Brubaker <cbrubaker@google.com>2017-03-28 20:59:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-28 20:59:17 +0000
commitc1ffef0629673f8e5dd702c1deec2f411417086e (patch)
tree378b3631dc6008fb8e56a37f7b6ab5a7a44c5843 /docs/html/sdk/api_diff/15
parent4b2ddf93d1479d720763f55f95581e8a93ee8bb7 (diff)
parentf0fb78b95db0ffbcff15a02120f180ee294e2736 (diff)
Merge "Add ACTION_EPHEMERAL_RESOLVER_SETTINGS" into oc-dev
am: f0fb78b95d Change-Id: I2ddd5efd4d2579cc2f0eae0dd6119cf939ae3534
Diffstat (limited to 'docs/html/sdk/api_diff/15')
0 files changed, 0 insertions, 0 deletions