diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2011-01-28 09:22:01 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-28 09:22:01 -0800 |
commit | e4f77dc5929417c6c34904b0cadb83285a240cff (patch) | |
tree | 6cf294496a64a43b025f6fed17f055b4e1d0b5bd /tools/aidl/generate_java.cpp | |
parent | 38eac1125b8242ca2640eb05fec724defd8c3fb0 (diff) | |
parent | 07a8778b560ce8d46bcf5aad012be575f3a90500 (diff) |
am 07a8778b: Merge "resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit '07a8778b560ce8d46bcf5aad012be575f3a90500':
Update networktype before sending state change.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions