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