am a5018c90: resolved conflicts for merge of 5223a5ff to master
am a5018c90: resolved conflicts for merge of 5223a5ff to master

* commit 'a5018c900f126ee8424c82497f32983873db741b':
  resolved conflicts for merge of 5223a5ff to master

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