tree 0ed5a6cfd79fae6c613676f1d317cb616ecbb09f
parent 88a6301eb3062ee2183b9bcdfd3939fefb832fc1
parent cc4e84ee3bf5be23b30dc06c3c861391e92ed633
author Dharmesh Mokani <mokani@google.com> 1410962208 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410962208 +0000

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

* commit 'cc4e84ee3bf5be23b30dc06c3c861391e92ed633':
  Remove STOPSHIPs from GSA 4.0