Shimeng (Simon) Wang d687504e73 am 31e4d66a: Merge "DO NOT MERGE" into gingerbread ...

Merge commit '31e4d66ada01ea0714304309967a38d07bfce6c6' into gingerbread-plus-aosp

* commit '31e4d66ada01ea0714304309967a38d07bfce6c6':
  DO NOT MERGE

2010-10-15 18:24:06 -07:00

..

config

…

java

am 31e4d66a: Merge "DO NOT MERGE" into gingerbread

2010-10-15 18:24:06 -07:00

jni

Merge a851d8d0 from gingerbread

2010-10-15 17:02:57 -07:00

res

am d3643668: Merge "DO NOT MERGE - Updated ADB icon" into gingerbread

2010-10-15 18:23:18 -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