am 5adfe6c5: merge from open-source master

Browse Source

Merge commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f'

* commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f':
  Fix the problem that color drawable cache key conflicts another drawable one.

...

This commit is contained in:

The Android Open Source Project 2010-07-16 14:06:06 -07:00 committed by Android Git Automerger

parent 352a7b59ed 7fd8fbb0c1

commit 54da4fa244

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available