summaryrefslogtreecommitdiff
path: root/tools/aidl/generate_java.cpp
diff options
context:
space:
mode:
authorXia Wang <xiaw@google.com>2011-04-13 15:52:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-13 15:52:39 -0700
commita4b76ff4911538f01e92af2f3fa3f4016ad0e290 (patch)
tree5c0c53922754aae2b1c15afcbeb5b832ffa72adf /tools/aidl/generate_java.cpp
parent8d2e14daa752d657b9747fc9734fbfd7b34c1f7a (diff)
parentd69ec89f5d31064174d79e2e77504814629cffa6 (diff)
am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
* commit 'd69ec89f5d31064174d79e2e77504814629cffa6': Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions