| commit | cb020611f950a326599a1b9b7676b148d51fb772 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Mon Aug 30 14:37:03 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 30 14:37:03 2010 -0700 |
| tree | bdea3e5db4423dda798e8c6f77275263bc9c91b3 | |
| parent | 430185526b019e3bbe58f15a0365a07607619c90 [diff] | |
| parent | c1858e5cefbd643737e978cbbca3f264d04d2d1b [diff] |
am c1858e5c: (-s ours) am 81ff156b: am 2ad6067c: (-s ours) do not merge: cherry-picked 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch Merge commit 'c1858e5cefbd643737e978cbbca3f264d04d2d1b' * commit 'c1858e5cefbd643737e978cbbca3f264d04d2d1b': do not merge: cherry-picked 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch