| commit | 13df2564af41ecfcd3a7c7707ca8106811b2d7a2 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Dec 15 19:02:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 15 19:02:26 2014 +0000 |
| tree | 968abe5dff94f59043451c62df61c8e6c9d10ad3 | |
| parent | 1c0967262981f070a2e22c817d97123513864a7d [diff] | |
| parent | 62d35b65f236e494520d7ca480e502c79f5f4fe3 [diff] |
am 62d35b65: resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp * commit '62d35b65f236e494520d7ca480e502c79f5f4fe3': Stop using apache-http in settings.