| commit | 955bee89abada8b6541f499c686376d4434242b1 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Oct 29 17:47:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 17:47:10 2014 +0000 |
| tree | ad54b9608db1be2c23432ef81333e86db5c8c78b | |
| parent | 263829e0e794f48335db2f49078c53fe10292e98 [diff] | |
| parent | dfdc6acc4809f395b9db2136acc89b6de932a1a5 [diff] |
am dfdc6acc: resolved conflicts for merge of 3c8cf51f into stage-aosp-master * commit 'dfdc6acc4809f395b9db2136acc89b6de932a1a5': Stop using apache http to download Gps XTRA data.