Ricardo Cervera 2287879039 am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev ...

* commit '93f94c2ca5bf23533fc5a9bd70a4795584d20618':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256

2015-01-16 18:29:25 +00:00

..

java

am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev

2015-01-16 18:29:25 +00:00

jni

Wire up surface width/height to lockHardwareCanvas DO NOT MERGE

2014-11-24 17:59:38 +00:00

res

Import translations. DO NOT MERGE

2014-12-22 21:51:09 -08:00

tests

Recover apps with malformed certificates.

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