Firefly f8e52a9a29 [system/security] Merge tag 'android-5.1.1_r24' into dev ...

Android 5.1.1 release 24

Conflicts:
	keystore/keystore.cpp

2015-12-31 16:53:34 +08:00

..

keystore

[system/security] Merge tag 'android-5.1.1_r24' into dev

2015-12-31 16:53:34 +08:00

keystore-engine

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00

softkeymaster

Commit of manifest rk312x_android5.1_rel_v1.02_0423.xml

2015-05-20 17:06:22 +08:00