am 15724ffc: am e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev
am 15724ffc: am e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev

* commit '15724ffc412fbc2147432f07e6aec20aecc74994':
  AAPT: Fix resource versioning

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