am 1b7ffcf4: (-s ours) am 5f23cb39: Modify settings for 2.1

Merge commit '1b7ffcf4957191cbd805a4863ece75cd549575e9'

* commit '1b7ffcf4957191cbd805a4863ece75cd549575e9':
  Modify settings for 2.1
This commit is contained in:
Jaikumar Ganesh
2009-09-16 23:53:54 -07:00
committed by Android Git Automerger

Diff Content Not Available