| commit | fc66fa5376d9864fd0e369073f95a729856df312 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Jun 10 11:57:05 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 10 11:57:05 2010 -0700 |
| tree | 86a8e7761bf825a89e1fba5ce4b5ddbb7004f374 | |
| parent | 3aede37f1902bd2d364111da11674a642afd318f [diff] | |
| parent | 9a9724c3be2199c54e7fcc6543bb41ba87af66ee [diff] |
am 9a9724c3: am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch