am a6e06889: Merge "Add profiler type options"
am a6e06889: Merge "Add profiler type options"

* commit 'a6e06889fce7fbf2049f421daef02b8986736f77':
  Add profiler type options

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