tree aa4c96029d126a90164cc31f67d63f91343ac5dc
parent 7cc43c91690bbcd3632b7567d25195e0058af53d
parent 1fa00b75f644dc81c627fdb75c898f4f8ad48cc1
author Neil Fuller <nfuller@google.com> 1420566844 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1420566845 +0000

Merge "Remove NPN support from Android's OkHttp Platform class"