| commit | e88164ce359f9d93223de09cd8d65cfc435ef1aa | [log] [tgz] |
|---|---|---|
| author | Shih-wei Liao <sliao@google.com> | Wed Apr 11 11:39:22 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 11 11:39:22 2012 -0700 |
| tree | d26f6137a077e03d7aa5a1d2e20194db3618704c | |
| parent | 91780ddb70f617eb6490ec964fba0c0dc27e267b [diff] | |
| parent | 6a30eab0ad4eb300d1621d1efad48fd1d117fdf2 [diff] |
am 6a30eab0: Merge "Fix 044-proxy. Implement proxy for now, working on x86 and ARM." into ics-mr1-plus-art * commit '6a30eab0ad4eb300d1621d1efad48fd1d117fdf2': Fix 044-proxy. Implement proxy for now, working on x86 and ARM.