am 7d5c0e66: am 15f0a79a: Merge "fix typo in comment @beamsOverlap"
am 7d5c0e66: am 15f0a79a: Merge "fix typo in comment @beamsOverlap"

Merge commit '7d5c0e660e52888f986acef2cecde8ddc9ca26c8'

* commit '7d5c0e660e52888f986acef2cecde8ddc9ca26c8':
  fix typo in comment @beamsOverlap

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