| commit | 9771190e3aa577fba9660f6dd4881ed39bfa6f0a | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Apr 15 17:51:30 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 15 17:51:30 2010 -0700 |
| tree | a3e33514e81b7ba6b7614289864e74d22abdd151 | |
| parent | d29def562fed95253edd687c96a0044d6eaabdf2 [diff] | |
| parent | 43725d4d4465e914a8c5209f254e780acc7fabd4 [diff] |
am 43725d4d: Merge "Manual merge of Idf6bb25438336616e6453e7afe0e79f227af98d3" into kraken