| commit | 97af83bca100773e22005bd13796d198fe6cd141 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Jun 10 11:58:59 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 10 11:58:59 2010 -0700 |
| tree | c5b5c1231874cb9b17bb7e4e01fa26f86fc82221 | |
| parent | 0809c0e4c61fb1f64925081c811df86c73f7070f [diff] | |
| parent | fc66fa5376d9864fd0e369073f95a729856df312 [diff] |
am fc66fa53: (-s ours) am 9a9724c3: am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch