OSDN Git Service

Merge "disable unpriv perf by default in user{,debug} builds" am: 4bc8280a98
authorJeffrey Vander Stoep <jeffv@google.com>
Wed, 1 Jun 2016 23:53:42 +0000 (23:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Jun 2016 23:53:42 +0000 (23:53 +0000)
commit3728ebcfafccca097e9e87413bda4557ce1fbfd8
treed3a2a8ba476a0708df968bf489c4732726ca1a1f
parent2a73e9280b9d38f2eefb4e762ba90488323cb2e4
parent13f2b4cf2f9ec4e17bedf75b01263b88d08982d6
Merge "disable unpriv perf by default in user{,debug} builds" am: 4bc8280a98
am: 13f2b4cf2f

* commit '13f2b4cf2f9ec4e17bedf75b01263b88d08982d6':
  disable unpriv perf by default in user{,debug} builds

Change-Id: Id14069a95cba23aff3540b3a43998cedd52b6ac7
core/main.mk