diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2012-10-15 11:40:40 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-15 11:40:40 -0700 |
commit | f78283324400487a9acdb5d32536295fa85bd8f3 (patch) | |
tree | 7655e771b0fb7342c7d303e1204176575aea31f5 /tools/aidl/generate_java_binder.cpp | |
parent | 9becdadb7fbdeee098a40212c24a0fb951b4df21 (diff) | |
parent | af614e7d3c28409cd1a9e53b3e6b5d6bc524f40f (diff) |
am af614e7d: am 4e579b5a: am a30d9694: Merge "Monitor the right interface re VPN" into jb-mr1-dev
* commit 'af614e7d3c28409cd1a9e53b3e6b5d6bc524f40f':
Monitor the right interface re VPN
Diffstat (limited to 'tools/aidl/generate_java_binder.cpp')
0 files changed, 0 insertions, 0 deletions