Irfan Sheriff 8a7e28ede6 am f99360bf: Merge "Initialize p2p settings" ...

* commit 'f99360bf8f8bd3bd9dfd91fa0e91384eaaeebc89':
  Initialize p2p settings

2011-08-29 17:38:33 -07:00

..

java

am 30cca602: Merge "Fix contentInvalidateAll NPE"

2011-08-29 17:16:14 -07:00

jni

am 335e40c0: Merge "Use seperate config file for p2p"

2011-08-29 16:33:00 -07:00

res

Merge "Initialize p2p settings"

2011-08-29 17:36:50 -07:00

tests

Merge "Fix bug #5199577 TextView with android:password="true" is showing the "dots" on the left even if the password chars are RTL"

2011-08-26 14:05:09 -07:00