Michael Jurka 588bfeeaad am f6f545f6: Merge "Fix the build" into klp-dev ...

* commit 'f6f545f6a7601c9c0b7f6132488cced1d3a0d78b':
  Fix the build

2013-10-14 17:48:00 -07:00

..

java

Merge "Fix the build" into klp-dev

2013-10-15 00:42:52 +00:00

jni

Merge "Fix registerListener and flush bugs." into klp-dev

2013-10-11 02:05:53 +00:00

res

am f64247e4: Merge "Fix change to re-add carrier roaming details." into klp-dev

2013-10-14 17:19:20 -07:00

tests

…