Justin Ho 6e48b5f97a am b593d976: Merge "Updated GPS icons and new status bar background" into gingerbread ...

Merge commit 'b593d976137389dcbe061f10ec13d79f0427baa3' into gingerbread-plus-aosp

* commit 'b593d976137389dcbe061f10ec13d79f0427baa3':
  Updated GPS icons and new status bar background

2010-10-14 18:36:39 -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 b593d976: Merge "Updated GPS icons and new status bar background" into gingerbread

2010-10-14 18:36:39 -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