commit | 7bb0d3b20345ee0fccf01d7ca2a4f941cb4ecefb | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Tue Jan 24 04:45:24 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jan 24 04:45:24 2017 +0000 |
tree | 86cf8658a7c2c406b4a91a77ea2d9722e96d95cc | |
parent | 1071bf7f950da368321d256c84ae4186649f5298 [diff] | |
parent | 596bc746f8c95b50073051d17fed23c120682c0d [diff] |
Merge "Allow tkill" am: 9fd1190790 am: 81b76391d3 am: 33d0bb6483 am: 781a9f5b7e Change-Id: Ia91bf6d21ca241d825753834e8c2d1cfa7c591eb