OSDN Git Service

Merge changes I26e290c0,I1b006d2a
authorColin Cross <ccross@android.com>
Tue, 24 May 2016 22:41:06 +0000 (22:41 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 24 May 2016 22:41:06 +0000 (22:41 +0000)
commitd603e616b917c098bf6b050138e7b7ce6054c07e
treec3c351b2b5fc12f538852ee62ddf8e671ecc0834
parent974a3c74ab0f8b5843178e8f02c48860d6c3e45c
parentf8d8f048570c98a3f4f4b2c8affd4725ffa6437f
Merge changes I26e290c0,I1b006d2a

* changes:
  Add oom score tracking to procrank
  C++-ify procrank