tree cf8f449c1e5f087208c9d05da9e91d63859569ba
parent 42afe2033fddc7c43ccfeb5f20defe992d0bc1a2
parent 2d48c395cca21bed9f2d7c0e891e11647c8432f9
author Jeffrey Vander Stoep <jeffv@google.com> 1466739679 +0000
committer android-build-merger <android-build-merger@google.com> 1466739679 +0000

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

Change-Id: I678c109987a60bfc97b44ef4a48a4d658283ca66