xinhe 62a22d5b1f resolved conflicts for merge of 046f3843 to lmp-sprout-dev(DO NOT MERGE) ...

The change is already in MR1 branch

Change-Id: I4ae35a8f76fdc2d4b1cdf2773dc27ff2da85b5ff

2014-11-19 11:48:43 -08:00

..

java

am d68b87cd: Recover apps with malformed certificates.

2014-11-12 22:20:46 +00:00

jni

Frameworks/base: Compiled-classes support

2014-11-18 15:14:06 -08:00

res

resolved conflicts for merge of 046f3843 to lmp-sprout-dev(DO NOT MERGE)

2014-11-19 11:48:43 -08:00

tests

Recover apps with malformed certificates.

2014-11-12 13:16:06 -08:00