OSDN Git Service

Merge "Revert "Revert "simpleperf: use libprocinfo.""" am: 960a81aaeb
authorYabin Cui <yabinc@google.com>
Thu, 17 Nov 2016 01:57:32 +0000 (01:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 01:57:32 +0000 (01:57 +0000)
am: 4d5775380e

Change-Id: I5c7678d653518a7418c0bbabd6198032ab226ff2


Trivial merge