Alex Klyubin 338e74648d resolved conflicts for merge of 1d5a2592 to master ...

Change-Id: Ia1ea7c9c8c23eeffcd596b96506e961989ccb7a6

2015-04-14 14:23:07 -07:00

..

java/android/security

resolved conflicts for merge of 1d5a2592 to master

2015-04-14 14:23:07 -07:00

tests

Make specifying self-signed cert parameters optional.

2015-04-14 12:56:17 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…