tree dc92adf1e8a825e8086a7ab7531d1e27a7adc4d8
parent fef97cc1a81ecbdb9e75b8f7c813aadfc6a9f29e
parent 285cd977300d0810864ff8e84d9fee0f3a85783e
author Mike Ma <yanmin@google.com> 1539066568 -0700
committer android-build-merger <android-build-merger@google.com> 1539066568 -0700

[automerger skipped] Merge "DO NOT MERGE: Fix signature of KernelCpuProcReader" into pi-dev am: 9457e1c429  -s ours
am: 285cd97730  -s ours

Change-Id: I24e0b3c66810cdf0cf360f81950f6d7df50a2013