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

Change-Id: I0bfdbf8751cf783055d1c2fd6859a888410b4ea8
tree: 3755b673d1659b5a65d217ceabe138fd1a7b8dcb
  1. src/
  2. Android.mk
  3. COPYING
  4. MODULE_LICENSE_APACHE2