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

2012-07-24 08:53:52 -07:00

..

java

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

2012-07-24 08:53:52 -07:00

jni

Properly resize paletted bitmaps when adjusting for density

2012-07-10 13:16:46 -07:00

res

Import translations. DO NOT MERGE

2012-07-18 14:19:56 -07:00

tests

Merge "Change NPN to forbid empty lists of protocols." into jb-dev

2012-05-17 11:18:33 -07:00