am d660e05c: am 8aa93764: Merge "Fixing NULL pointer access causing segmentation fault in aapt"
am d660e05c: am 8aa93764: Merge "Fixing NULL pointer access causing segmentation fault in aapt"

* commit 'd660e05c84c7412336ca5510ff9514357e9ba074':
  Fixing NULL pointer access causing segmentation fault in aapt

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