| commit | e3ddef9e96efe1bb7c816b37044624dce70af8a0 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jan 30 04:21:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 30 04:21:28 2015 +0000 |
| tree | d6c36f3ae2111ed448cbfb77871772305e27b15a | |
| parent | 1283abaf6904d4f43da4c66daf3f9ccc63753e6c [diff] | |
| parent | 3a8064c5cf4187c7c808bbdd5c2eeaee905dbead [diff] |
am 3a8064c5: am 0114e124: Merge "Add ps --ppid." * commit '3a8064c5cf4187c7c808bbdd5c2eeaee905dbead': Add ps --ppid.