| commit | 1bcbf3593d41ee3cfa6c765129a701d76886bae1 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed Apr 03 15:03:48 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 03 15:03:48 2013 -0700 |
| tree | 18c77dae409094b01c3c7f00cce57b0abddfa984 | |
| parent | 1e144f7d7b69ba6fb6bf55ebc0958ece75c4772c [diff] | |
| parent | 712676772b0d6e32bdce3430eed0a4d9771aac7e [diff] |
am 71267677: resolved conflicts for merge of 5ec66d15 to jb-mr2-dev-plus-aosp * commit '712676772b0d6e32bdce3430eed0a4d9771aac7e': Add OkHttp to the platform.