| commit | 3a8064c5cf4187c7c808bbdd5c2eeaee905dbead | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jan 30 04:17:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 30 04:17:01 2015 +0000 |
| tree | c1efdfd94d08a8e3ced6d7776d93118f4a0a2bdb | |
| parent | 73bdc3cd42e5681b72d26d109354a2e5e007ed72 [diff] | |
| parent | 0114e1243ad25cbb43dec33a3b0b267fe624fbfe [diff] |
am 0114e124: Merge "Add ps --ppid." * commit '0114e1243ad25cbb43dec33a3b0b267fe624fbfe': Add ps --ppid.