| commit | 05b061e3369f52a510456acefa0a25e7ff256d3d | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Mon Aug 27 07:16:17 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 27 07:16:17 2018 -0700 |
| tree | cc01da88a75330bad4a9e4245c916272e17407c6 | |
| parent | c75a144473e0c73cbfe891ad1fcfa3ff39f0346b [diff] | |
| parent | 104f588161ae2e7ed822b5a327294c319846ae7e [diff] |
[automerger skipped] Merge "DO NOT MERGE Use correct lock when killing processes" into pi-dev am: b4190776a7 am: 104f588161 -s ours Change-Id: Ie42a60dae9837dccdae02072bb6d861f89507fe8