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