commit | 0015bd2c46aa6c6ddba38684f7ab09e24b637809 | [log] [tgz] |
---|---|---|
author | Jeffrey Vander Stoep <jeffv@google.com> | Fri Jun 24 03:51:10 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 24 03:51:10 2016 +0000 |
tree | f09a40909c1c539346fdcbc20ae18151dcb1c976 | |
parent | e7eed8b4985a7485a395bc44d5abd4f3afa07757 [diff] | |
parent | 70fbe30c9ac1abf717bd4f0ab4cd9ba6b0698a13 [diff] |
Merge \"Merge \\\\\\\"add a property for controlling perf_event_paranoid\\\\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 am: 2d48c395cc am: 34ae543dc3 am: 2ef8922c29\" into nyc-mr1-dev-plus-aosp am: 70fbe30c9a Change-Id: I91c7828be978f644ba4bb2929ce93b5d617c846a