Alex Klyubin 1620a65d32 resolved conflicts for merge of 06adabdb to master ...

Change-Id: Ifb09e2e6242f79cabe76e95eacc982f6cc7e1a6c

2015-04-07 11:39:51 -07:00

..

java/android/security

resolved conflicts for merge of 06adabdb to master

2015-04-07 11:39:51 -07:00

tests

Mark all test keys as no auth required

2015-04-02 14:41:37 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…