John Spurlock 8740cb1da6 resolved conflicts for merge of 29211d3a to master ...

Change-Id: I9691f41b12fbf52d0ef35a9bf5223edef7afdfd2

2013-04-05 16:18:59 -04:00

..

java

resolved conflicts for merge of 29211d3a to master

2013-04-05 16:18:59 -04:00

jni

Fix reference cycle in InputEventReceiver and Sender.

2013-04-02 18:59:15 -07:00

res

resolved conflicts for merge of 29211d3a to master

2013-04-05 16:18:59 -04:00

tests

Merge "Add direct API to get ManifestDigest" into jb-mr2-dev

2013-04-03 20:27:43 +00:00