tree 3755b673d1659b5a65d217ceabe138fd1a7b8dcb
parent cc5bac0a575f83246ab4b2696f19497f63d90f00
parent 67bf89d8c6bd737ca1fab317fa7c7c5c2c9e876b
author Jiyong Park <jiyong@google.com> 1519054238 +0000
committer android-build-merger <android-build-merger@google.com> 1519054238 +0000

Merge "Reland "Build mockwebserver with core_current"" am: 5ea6d395c5 am: 6b5ff527e5
am: 67bf89d8c6

Change-Id: I06315e5155f7b0be8513faea25447c6338f027ea