OSDN Git Service

Merge changes I26e290c0,I1b006d2a
authorColin Cross <ccross@android.com>
Tue, 24 May 2016 22:45:52 +0000 (22:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 May 2016 22:45:52 +0000 (22:45 +0000)
commita2632be956cf05558cc7825830ffd5f9f093206d
treec3c351b2b5fc12f538852ee62ddf8e671ecc0834
parentd2d7c446bd0481038824d8c07f044952209191ee
parentd603e616b917c098bf6b050138e7b7ce6054c07e
Merge changes I26e290c0,I1b006d2a
am: d603e616b9

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

Change-Id: Icc3e2762f8c46b5742176582abc09f624182ff51