Michael Chan 19a048626e am a13730f4: Merge "Fixed the problem where getEntityAndIncrementCursor would always return "0" for attendeeIdentity & attendeeIdNamespace instead of the actual string." into jb-dev ...

* commit 'a13730f42449d97ec7206769ccaad9d95bc2924f':
  Fixed the problem where getEntityAndIncrementCursor would always return "0" for attendeeIdentity & attendeeIdNamespace instead of the actual string.

2012-07-24 22:00:39 -07:00

..

java

am a13730f4: Merge "Fixed the problem where getEntityAndIncrementCursor would always return "0" for attendeeIdentity & attendeeIdNamespace instead of the actual string." into jb-dev

2012-07-24 22:00:39 -07:00

jni

am 2c932143: Merge "s/LOG/ALOG/ in HAVE_SELINUX blocks"

2012-07-19 17:14:51 -07:00

res

am a4d4df16: Merge "Import translations. DO NOT MERGE" into jb-dev

2012-07-18 20:14:46 -07:00

tests

Create telephony-common and mms-common - DO NOT MERGE

2012-07-17 12:23:09 -07:00