am e5a6d16f: Merge change 25785 into eclair
am e5a6d16f: Merge change 25785 into eclair

Merge commit 'e5a6d16f26543061a0fc815ba90644a44995e025' into eclair-plus-aosp

* commit 'e5a6d16f26543061a0fc815ba90644a44995e025':
  Fix http://b/2126318 (density test fails due to wrong-size asset stripping)

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