am d529d0df: Merge "bug:3396894 (HC branch) remove STOPSHIP code" into honeycomb
* commit 'd529d0df8f2e93e0dc74887ab43eff46e07cef2e': bug:3396894 (HC branch) remove STOPSHIP code
This commit is contained in:
commit
895f6e2c32
* commit 'd529d0df8f2e93e0dc74887ab43eff46e07cef2e': bug:3396894 (HC branch) remove STOPSHIP code