Jeff Brown 6ba052b484 am c1a564b1: Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread ...

Merge commit 'c1a564b108c511c0bdd699567c245b031930e718' into gingerbread-plus-aosp

* commit 'c1a564b108c511c0bdd699567c245b031930e718':
  Add support for secure system overlays.  (DO NOT MERGE)

2010-10-15 18:40:39 -07:00

..

config

…

java

am c1a564b1: Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread

2010-10-15 18:40:39 -07:00

jni

Merge a851d8d0 from gingerbread

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

res

am b3c2d480: Merge "DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)" into gingerbread

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