am 07fb33ef: (-s ours) am d8f1a540: Merge "Refrain warning when not...
am 07fb33ef: (-s ours) am d8f1a540: Merge "Refrain warning when not appropriate. Do not merge" into gingerbread
Merge commit '07fb33ef'
* commit '07fb33ef':
Refrain warning when not appropriate. Do not merge