tree f66cade5f22b46816974f803f5ef6525be8d24d7
parent 33f5ffc3f38ced6b3c2ba9b69fc890c637a8b3d8
parent e6d915d78ecdb0f4d4428cb5421615473601ab4f
author Tobias Thierer <tobiast@google.com> 1504712088 +0000
committer android-build-merger <android-build-merger@google.com> 1504712088 +0000

Merge "Fix ConfigAwareConnectionPoolTest" am: 9ac02268c4
am: e6d915d78e

Change-Id: I11ba8386da5ac50447ebc14e50609549c7b60a36