tree 5f981cdd5452e9d4ac20d11121550aa5f81112d9
parent 3b7f991451c3a70f910fe5a3a3b54429e9b75111
parent 47a37a9e6469a23064ccbefa3dd92fa9b0fdb16a
author Tobias Thierer <tobiast@google.com> 1467290926 +0000
committer android-build-merger <android-build-merger@google.com> 1467290926 +0000

Merge changes from topic \'okhttp2-upgrade\'
am: 47a37a9e64

Change-Id: I11d2a4b9bd410a1fe0eb0569011bc41df0b368e4