Jose Lima 41c2d2cec3 Merge "resolved conflicts for merge of 6c45157c to master"

2014-03-24 22:35:08 +00:00

..

java

resolved conflicts for merge of 6c45157c to master

2014-03-24 15:33:25 -07:00

jni

Add stagingProperties

2014-03-24 15:31:34 -07:00

res

resolved conflicts for merge of 6c45157c to master

2014-03-24 15:33:25 -07:00

tests

am 560e7541: am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev

2014-03-18 22:34:17 +00:00