| commit | 6a30eab0ad4eb300d1621d1efad48fd1d117fdf2 | [log] [tgz] |
|---|---|---|
| author | Shih-wei Liao <sliao@google.com> | Wed Apr 11 11:37:24 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 11 11:37:24 2012 -0700 |
| tree | 1f2f032d46d2759984d5cdf9f5e1e5c723e99f17 | |
| parent | 61a9c617f9690b0132580efa2062de88845450dd [diff] | |
| parent | 5bb8601175bbb9cd761c715f4ba04f84d65e913b [diff] |
Merge "Fix 044-proxy. Implement proxy for now, working on x86 and ARM." into ics-mr1-plus-art