| commit | 5661490a57ac7b1ded20ca4433eae4c5ecf41747 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Apr 15 18:01:32 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 15 18:01:32 2010 -0700 |
| tree | 76f963d3b8a5d1e1630f297859c062f44c09a2b0 | |
| parent | 9771190e3aa577fba9660f6dd4881ed39bfa6f0a [diff] | |
| parent | 318249e46783c69d495c3a023b0de97757687050 [diff] |
am 318249e4: Merge "Manual merge of Ida6a4cdd3abcbcab7e2fe8450a25c0dc36765f04" into kraken