OSDN Git Service

Merge changes I26e290c0,I1b006d2a am: d603e616b9
authorColin Cross <ccross@android.com>
Tue, 24 May 2016 22:48:35 +0000 (22:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 May 2016 22:48:35 +0000 (22:48 +0000)
commitb840eb606d645fdcec647b6dfb9e5a5a35ac7d0f
tree4d896b56e3400d9c5e323929b09a01904132b978
parentf6553f90638e67a5c1c194fa83a6bd02a9b6cd87
parenta2632be956cf05558cc7825830ffd5f9f093206d
Merge changes I26e290c0,I1b006d2a am: d603e616b9
am: a2632be956

* commit 'a2632be956cf05558cc7825830ffd5f9f093206d':
  Add oom score tracking to procrank
  C++-ify procrank

Change-Id: Ic2baa7e0144480a2400299e2b981c158e4709caa
procrank/procrank.cpp