tree c028bfe537607823c37e2ffc8c713c73059d3130
parent c9c8bbc8b571e52836d09ac42a8596c1fc37e28d
parent 6ac9c68e4e214c57a69ae95f8c3a1f0cde27116f
author Dharmesh Mokani <mokani@google.com> 1422685353 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685353 +0000

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

* commit '6ac9c68e4e214c57a69ae95f8c3a1f0cde27116f':