am a3f5b615: (-s ours) am f3847e87: Merge "DO NOT MERGE" into gingerbread

* commit 'a3f5b615d7adc5a644cbedd55100deba562ec0ac':
  DO NOT MERGE
This commit is contained in:
James Dong
2010-11-03 12:02:53 -07:00
committed by Android Git Automerger

Diff Content Not Available