| commit | e742799cae886e0e9b2eb5514e58bab27e34a0ee | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Tue Jan 28 00:45:44 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 28 00:45:44 2014 +0000 |
| tree | 36cf7eb5a81209d8501011a4ca0a9473e7a79257 | |
| parent | 548061e5b63913a71b5101e5887a87f818cffadd [diff] | |
| parent | 4f02bf4eef6af47f35c70c4dda5b7b9523d89ca0 [diff] |
Merge "Native-side proxy"