am d8f1a540: Merge "Refrain warning when not appropriate. Do not merge" into gingerbread

Merge commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2' into gingerbread-plus-aosp

* commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2':
  Refrain warning when not appropriate. Do not merge
This commit is contained in:
Daisuke Miyakawa 2010-10-04 08:36:27 -07:00 committed by Android Git Automerger
commit e09a54e3cb

Diff Content Not Available