Kenny Root e9ae6822a8 resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp ...

Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176

2013-04-29 23:09:03 -07:00

..

src/android/security

resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

2013-04-29 23:09:03 -07:00

Android.mk

Track change to JSSE provider

2013-04-29 15:15:27 -07:00

AndroidManifest.xml

Remove useless TestRunner

2012-08-10 13:40:19 -07:00