summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/15/changes
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2011-01-29 09:35:28 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-29 09:35:28 -0800
commitb46062bc0886eb176afe23b7dab81db3ab6c1beb (patch)
tree918b40e671a8a72bc11e305361df875f8a2b8982 /docs/html/sdk/api_diff/15/changes
parentf8f37d97ce108e12dd973de941de5185df500a9d (diff)
parentf8fdec50c7871b640c13cfe3e2e7a3b449f62f69 (diff)
am f8fdec50: resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp
* commit 'f8fdec50c7871b640c13cfe3e2e7a3b449f62f69': Add some network types that OEM's are asking for.
Diffstat (limited to 'docs/html/sdk/api_diff/15/changes')
0 files changed, 0 insertions, 0 deletions