tree 0ed5a6cfd79fae6c613676f1d317cb616ecbb09f
parent 05f669b096c8559b410e17574f7b79f90f278593
parent ae5c0ad20c6e3cf1c71ad706b4f0800292867c21
author Dharmesh Mokani <mokani@google.com> 1410962563 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410962563 +0000

am ae5c0ad2: am cc4e84ee: Merge "Remove STOPSHIPs from GSA 4.0" into ub-now-porkchop

* commit 'ae5c0ad20c6e3cf1c71ad706b4f0800292867c21':
  Remove STOPSHIPs from GSA 4.0