Shimeng (Simon) Wang 53820a9694 am 7ef6834e: Merge "DO NOT MERGE" into gingerbread ...

Merge commit '7ef6834eea24e56d6eba3aac7069e9e0981451d7' into gingerbread-plus-aosp

* commit '7ef6834eea24e56d6eba3aac7069e9e0981451d7':
  DO NOT MERGE

2010-10-15 18:25:25 -07:00

..

config

…

java

am 7ef6834e: Merge "DO NOT MERGE" into gingerbread

2010-10-15 18:25:25 -07:00

jni

Merge a851d8d0 from gingerbread

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

res

am 73dbdc35: Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into gingerbread

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