tree 0ed5a6cfd79fae6c613676f1d317cb616ecbb09f
parent a20490cd9ee80d0dc8eb035d50853b48592cac5b
parent 3d0854e4b8c0a6daaa80ac14c6bc7572a4e90916
author Dharmesh Mokani <mokani@google.com> 1410923410 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1410923410 +0000

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