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