am 7ddcf03b: am 255b263c: Merge "Modify base Configuration used for aapt dump badging" into lmp-dev
am 7ddcf03b: am 255b263c: Merge "Modify base Configuration used for aapt dump badging" into lmp-dev

* commit '7ddcf03bc2199d2f1efe04762e42ca60b3265f98':
  Modify base Configuration used for aapt dump badging

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