Torne (Richard Coles) ccd0204e9d resolved conflicts for merge of f96b93e2 to master ...

Change-Id: I28dbc39dde7bf5c8bb50cff0f6bc49a90c9c4dbe

2013-10-15 14:04:16 +01:00

..

java

resolved conflicts for merge of f96b93e2 to master

2013-10-15 14:04:16 +01:00

jni

am 1f5da180: am f730b759: am d6c2ccb2: Merge "core: fix arithmetic on a pointer to void"

2013-10-14 13:19:52 -07:00

res

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

2013-10-15 04:02:20 -07:00

tests

add a test for BackupData helpers.

2013-09-25 19:33:21 +00:00