Svetoslav 9450faccd2 am aef4f6eb: Merge "Fix build" ...

* commit 'aef4f6ebc8f8eb1f9fbfbe4ae2556c9f1a26a63c':
  Fix build

2014-03-20 11:44:14 -07:00

..

java

am aef4f6eb: Merge "Fix build"

2014-03-20 11:44:14 -07:00

jni

am e28f061f: am 76ae4b80: am c850102d: am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to register."

2014-03-20 10:28:32 +00:00

res

Merge "Import translations. DO NOT MERGE"

2014-03-20 18:32:30 +00:00

tests

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

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