Merge commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2' into gingerbread-plus-aosp * commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2': Refrain warning when not appropriate. Do not merge
Merge commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2' into gingerbread-plus-aosp * commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2': Refrain warning when not appropriate. Do not merge