| commit | 681838a16848b128bec073451789fd363f53a369 | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Thu Aug 27 04:48:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 04:48:30 2015 +0000 |
| tree | 9779095e5a603526d44704c559c820d3628c5ea8 | |
| parent | 1c6626e1d54ceb8578bfb6fb5e2ec2915e75c94c [diff] | |
| parent | 9097d1347ba48755b20abefb8ddadd26dc67209b [diff] |
am 9097d134: (-s ours) am d56f0067: Merge "QUIC port 80 support is going away" into mnc-dev * commit '9097d1347ba48755b20abefb8ddadd26dc67209b':