commit | 6ac9c68e4e214c57a69ae95f8c3a1f0cde27116f | [log] [tgz] |
---|---|---|
author | Dharmesh Mokani <mokani@google.com> | Sat Jan 31 02:02:04 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 02:02:04 2015 +0000 |
tree | 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25 | |
parent | cb9343d085689eb71df83757fe004afb0478b775 [diff] | |
parent | 67eac8d023e38dd0be0889a4d2f2ca57cfe48d4e [diff] |
am 67eac8d0: am ae5c0ad2: am cc4e84ee: Merge "Remove STOPSHIPs from GSA 4.0" into ub-now-porkchop * commit '67eac8d023e38dd0be0889a4d2f2ca57cfe48d4e':