| commit | 61f8955e12173be5044391dde7d8711b4d7b98c2 | [log] [tgz] |
|---|---|---|
| author | Collin Mulliner <collinrm@squareup.com> | Tue Jun 07 04:24:27 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 07 04:24:27 2016 +0000 |
| tree | 32331d506d6760faaf240a6b1973b6442c4f9270 | |
| parent | 4afb84937504c7bbdceaf56995dac93048b266ef [diff] | |
| parent | 2848f760f5a05450f8ddcd619e2c35c6f9ac5ca3 [diff] |
resolve merge conflicts of cea1d04 to nyc-dev-plus-aosp am: 8d532e4737 * commit '8d532e47376859e2ea8f953ebe75d24560e80464': use process groups for processes started by init Change-Id: I720291ac0966333e56f2607fe219a56bca541ee8