| commit | 2518895c500d0ccd0eb43580a81149c0fd256855 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Jan 26 18:45:42 2011 -0800 |
| committer | Scott Main <smain@google.com> | Wed Jan 26 18:47:13 2011 -0800 |
| tree | ea3352cf5afb4da4bb0f33095f87648a0ea83ff9 | |
| parent | 0518e7b5bddfdeb010591c736fb080009a99cd14 [diff] | |
| parent | 77ba255e32244809fb5cfcc56fe17d55dc42ccc9 [diff] |
resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp Change-Id: Ib40af8301e19b70c86161fc0a6cc061b118863ab