tree 10da860fcff71886af91d082e31f0e1917926848
parent 5dd8958bb808e68885d3a0739ac608a068a5b71b
parent ae5c0ad20c6e3cf1c71ad706b4f0800292867c21
author Dharmesh Mokani <mokani@google.com> 1422666526 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666526 +0000

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

* commit 'ae5c0ad20c6e3cf1c71ad706b4f0800292867c21':