refs/heads/nougat-mr1-dev - platform/external/mockwebserver

commit: 69ca35f6fd7f1f49ff2ac8b44b43b7e9578fd5c7
[log]
author: Narayan Kamath <[email protected]>
Thu Dec 24 12:05:07 2015 +0000
committer: android-build-merger <[email protected]>
Thu Dec 24 12:05:07 2015 +0000
tree: 29bef7c7ee1b4f302dc86d26dabcf37776987c22
parent: 4a373829b099ba8aab9c4b88c25cd0391b5051dc [diff]
parent: 7de829dfae22e9be8aa973a721d59c48d7f6fe7d [diff]

Merge "Add core-oj to the list of core library jars."
am: 7de829dfae

* commit '7de829dfae22e9be8aa973a721d59c48d7f6fe7d':
  Add core-oj to the list of core library jars.

tree: 29bef7c7ee1b4f302dc86d26dabcf37776987c22

src/
Android.mk
COPYING
MODULE_LICENSE_APACHE2