From: Robert Greenwalt <>
Date: Wed, 8 Apr 2009 00:19:28 +0000 (-0700)
Subject: AI 144950: Manual integration of 144342 and 144547 from donutburger to cupcake.
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/8ec55f9174b7a620ecde564fb29e9e5a1296df01?hp=8ec55f9174b7a620ecde564fb29e9e5a1296df01

AI 144950: Manual integration of 144342 and 144547 from donutburger to cupcake.
  Fix bag (string-array, etc) behavior with overlays.
  We used to replace elements in the default with elements from the
  overlay.  This change causes us to empty the array first so if the
  overlay array is smaller we don't end up with elements from the
  default array showing through at the end of the final result.
  Ex: [A,B,C] default with [D] overlay should give [D] but used to
  give [D,B,C]
  BUG=1754390

Automated import of CL 144950
---