commit | 380022fac800728c76004584202571636c1eabfc | [log] [tgz] |
---|---|---|
author | Justin Ho <justinho@google.com> | Mon Oct 25 17:25:02 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 25 17:25:02 2010 -0700 |
tree | fa2b133be43a0eb36fb205669b9996b9fa945f1f | |
parent | d6d41befe0a4afc62c81141967c7964cd02f7b54 [diff] | |
parent | d6a3b3885f7e623ba04ac49e6a4197d47cf98fcf [diff] |
am 41d21efd: (-s ours) am 044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread Merge commit '41d21efd61157c9a4c49b2f7a6580ae0cbb58397' * commit '41d21efd61157c9a4c49b2f7a6580ae0cbb58397': DO NOT MERGE - Updated ringtone assets for crespo