am d5f23f2e: am 2d3571cc: Merge "Fix the length of a profiler system property"
am d5f23f2e: am 2d3571cc: Merge "Fix the length of a profiler system property"

* commit 'd5f23f2ec0769248d00cfd6e9049cfa354492cce':
  Fix the length of a profiler system property

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base