Daniel Lehmann c61c98fdba am d16f7588: Merge "DO NOT MERGE: Private API to pass the selected tab through QuickContacts" into gingerbread ...

Merge commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98' into gingerbread-plus-aosp

* commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98':
  DO NOT MERGE: Private API to pass the selected tab through QuickContacts

2010-10-14 18:34:17 -07:00

..

config

…

java

am d16f7588: Merge "DO NOT MERGE: Private API to pass the selected tab through QuickContacts" into gingerbread

2010-10-14 18:34:17 -07:00

jni

am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread

2010-10-13 22:54:10 -07:00

res

am 1fefe88c: Another attempt at popup assets (hdpi and mdpi)

2010-10-14 17:42:08 -07:00

tests

am 8f666c2d: Merge "Test that we don\'t leak sensitive information when logging cookies." into gingerbread

2010-10-14 16:02:57 -07:00