Sync branch android to head. #835
Conversation
Adding support for NPN fallback.
|
We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm. |
|
@ejona86 @zsurocking, just sync, no any additional change, waiting for a LGTM. |
|
LGTM |
|
Does the android branch still need to be a fork? I seem to remember we cherry-picked some fixes, but if we are syncing to HEAD those should already be included. |
|
This was done per @zsurocking's request, @zsurocking, could you comment on @ejona86's question. |
|
nm... This PR displays differently than I thought it did before. It isn't forked right now, so everything looks fine. |
@zsurocking