| commit | 54da4fa244c7008c26ebb5ccd93ff6dc8d82989b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 16 14:06:06 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 16 14:06:06 2010 -0700 |
| tree | 865001488b1da7c62d1ba9e864e0a7716d743674 | |
| parent | 352a7b59ed45778b84df5cefdfdc21aefc5e77a7 [diff] | |
| parent | 7fd8fbb0c159b5c5a89838fa482fb745b1547c31 [diff] |
am 5adfe6c5: merge from open-source master Merge commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f' * commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f': Fix the problem that color drawable cache key conflicts another drawable one.