tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent cb9343d085689eb71df83757fe004afb0478b775
parent 67eac8d023e38dd0be0889a4d2f2ca57cfe48d4e
author Dharmesh Mokani <mokani@google.com> 1422669724 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669724 +0000

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

* commit '67eac8d023e38dd0be0889a4d2f2ca57cfe48d4e':