am 0c97c7c8: Merge change 1668 into donut
am 0c97c7c8: Merge change 1668 into donut

Merge commit '0c97c7c8562048135cc129044219f9bbdfc1f108'

* commit '0c97c7c8562048135cc129044219f9bbdfc1f108':
  Document exception from parse3339

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