diff options
| author | Geremy Condra <gcondra@google.com> | 2013-07-15 21:56:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-15 21:56:30 +0000 |
| commit | 045ad910b7efb912725b4fdc9e710d9a1d3d9d65 (patch) | |
| tree | b9a507af0b100d1aad2cbb4f0bb98e844588443d /tools/aidl/generate_java.cpp | |
| parent | 648e4fc7ad7db0f2c73851cf05ca3862029db8b7 (diff) | |
| parent | 4ca19e8377f33e8a80684fb4ee67f5a4bdc9ea76 (diff) | |
Merge changes Ia6646363,I94389b64
* changes:
Add per user VPN support
Add NetworkUtil function for marking sockets
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions