tree a47e21453000dfdc3037bb1dc0239057d5e909f9
parent 46104a0d7938912bdb51ac0fe5d94f791100538a
parent 2a311a9b3801afe6f09f05988bb582f873081c56
author Daniel Micay <danielmicay@gmail.com> 1466716241 +0000
committer android-build-merger <android-build-merger@google.com> 1466716241 +0000

Merge \\\"add a property for controlling perf_event_paranoid\\\" into mnc-dev am: 050243df76 am: f11efb251d
am: 2a311a9b38

Change-Id: I6ea7f744704405be67cf3cfa175b4142b5255e05