Torne (Richard Coles) 92dd5ada8a Resolved conflicts for merge of db931a3b to master ...

Change-Id: I5d71df1e2272b8fc35e5f1e0346284704b9d62ff

2013-10-15 13:48:58 +01:00

..

java

Resolved conflicts for merge of db931a3b to master

2013-10-15 13:48:58 +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