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

* commit '7fa83d269b6f84ae32ddc94731a44acb6d66c4c1':
  AAPT: Fix resource versioning