diff options
author | Justin Ho <justinho@google.com> | 2010-11-18 15:10:02 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-18 15:10:02 -0800 |
commit | 3d019afcdb167a04d9c879285b448f9be1de3c67 (patch) | |
tree | fe95c5a55a9560161bf4e53637a65b6285838c82 /libs/rs/rsAllocation.h | |
parent | 23c430ca7534671d187049ab5fd9a69700d7cb81 (diff) | |
parent | 5e5c2a199a9e44ef56c6638a52b9a9153f3d8c0d (diff) | |
download | frameworks_base-3d019afcdb167a04d9c879285b448f9be1de3c67.zip frameworks_base-3d019afcdb167a04d9c879285b448f9be1de3c67.tar.gz frameworks_base-3d019afcdb167a04d9c879285b448f9be1de3c67.tar.bz2 |
am 5e5c2a19: (-s ours) am 80381ab4: Merge "DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem" into gingerbread
* commit '5e5c2a199a9e44ef56c6638a52b9a9153f3d8c0d':
DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem
Diffstat (limited to 'libs/rs/rsAllocation.h')
0 files changed, 0 insertions, 0 deletions