| commit | 4c7ddabefa9af119be388de8e0f701feeee79658 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Tue Jan 20 13:29:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 20 13:29:31 2015 +0000 |
| tree | e8821585a226eb25b7a3d90ec901404bfcf641fa | |
| parent | 1480108d05f37b7ae50dab68eb9e3c1eca3519f6 [diff] | |
| parent | 7014da74e861f8cfc34fcbd528b4c83a1dc97503 [diff] |
am 7014da74: resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp * commit '7014da74e861f8cfc34fcbd528b4c83a1dc97503': Changes associated with an OkHttp upgrade