am dc5f3888: am 135677a7: For userdebug builds, enable Dalvik lock contention sampling.
am dc5f3888: am 135677a7: For userdebug builds, enable Dalvik lock contention sampling.

Merge commit 'dc5f3888d092310f1bb7f0d26be05d4b4cef6b91' into kraken

* commit 'dc5f3888d092310f1bb7f0d26be05d4b4cef6b91':
  For userdebug builds, enable Dalvik lock contention sampling.

RR-msm7x30/platform_manifest,Hybrid-Power/startsync,see4ri/lolili,fallouttester/platform_manifest,hagar006/platform_manifest,xorware/android_build,pranav01/platform_manifest,xorware/android_build,ND-3500/platform_manifest,xorware/android_build,knone1/platform_manifest,xorware/android_build,xorware/android_build