Merge commit '53f33d84776a0bad668e361365a7049b16f8a929' into eclair-plus-aosp * commit '53f33d84776a0bad668e361365a7049b16f8a929': Revert "Remove STOPSHIP comment."
Merge commit '53f33d84776a0bad668e361365a7049b16f8a929' into eclair-plus-aosp * commit '53f33d84776a0bad668e361365a7049b16f8a929': Revert "Remove STOPSHIP comment."