am d4ed049: Merge branch \'readonly-p4-donut\' into donut
am d4ed049: Merge branch \'readonly-p4-donut\' into donut

Merge commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c'

* commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c':
  AI 148024: fix NPE when there is no history

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