Justin Ho ff14aa16ba DO NOT MERGE - Updated media transport controls (hdpi and mdpi) ...

Change-Id: I9b91c4bc13909017f433724e7c21de0db690eff6

2010-10-15 14:03:57 -07:00

..

config

…

java

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

2010-10-14 18:31:16 -07:00

jni

OBB: use PBKDF2 for key generation.

2010-10-13 18:25:33 -07:00

res

DO NOT MERGE - Updated media transport controls (hdpi and mdpi)

2010-10-15 14:03:57 -07:00

tests

Merge "Test that we don't leak sensitive information when logging cookies." into gingerbread

2010-10-14 15:57:59 -07:00