am f19f6397: Merge "edits to the lollipop highlights" into lmp-dev
am f19f6397: Merge "edits to the lollipop highlights" into lmp-dev

* commit 'f19f639773e64289ed7345b8a1ea4dd244aa4882':
  edits to the lollipop highlights

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