| commit | 5f49fd866105cd8d5e7355d40d1268f4cc121ef7 | [log] [tgz] |
|---|---|---|
| author | Geremy Condra <gcondra@google.com> | Fri Apr 19 23:59:00 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 19 23:59:00 2013 -0700 |
| tree | 2fb007a42f85574e036cc5e83b3824e4c93b8d3f | |
| parent | b322f99476574546cad638ed8e2866ec106d51fc [diff] | |
| parent | 464be7975fa8938d7ab427789faa5e222bc6ab2c [diff] |
am 464be797: (-s ours) am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp * commit '464be7975fa8938d7ab427789faa5e222bc6ab2c': Add a delimiter between scheme and host