| commit | 81ff156bea2804d689fed98b076c2cea0928d752 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Mon Aug 30 14:29:13 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 30 14:29:13 2010 -0700 |
| tree | 09fb30b7baa139c643ca2aaee503beebbf2ac6ef | |
| parent | 44db990d3a4ce0edbdd16fa7ac20693ef601b723 [diff] | |
| parent | 2ad6067ce491446ab22f59a363d36575a942f5c7 [diff] |
am 2ad6067c: (-s ours) do not merge: cherry-picked 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch Merge commit '2ad6067ce491446ab22f59a363d36575a942f5c7' into gingerbread * commit '2ad6067ce491446ab22f59a363d36575a942f5c7': do not merge: cherry-picked 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch