Makoto Onuki 46d1212704 am bde32efa: Merge "Fix bug 6563184: API compatibility issue with quick contact" into jb-dev ...

* commit 'bde32efa209acb47324add8981577af1fa410574':
  Fix bug 6563184: API compatibility issue with quick contact

2012-05-31 11:01:24 -07:00

..

java

am bde32efa: Merge "Fix bug 6563184: API compatibility issue with quick contact" into jb-dev

2012-05-31 11:01:24 -07:00

jni

Increase busy timeout.

2012-05-30 15:18:51 -07:00

res

am 762ca84c: Merge "Sped up ActionBar and StatusBar animations" into jb-dev

2012-05-30 17:27:21 -07:00

tests

am 9cb376e7: Merge "Change NPN to forbid empty lists of protocols." into jb-dev

2012-05-17 11:20:21 -07:00