| commit | d1971c4cac37fccdccd105f78f7252582685ccd9 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Mon Sep 27 14:16:44 2010 -0400 |
| committer | Mike Lockwood <lockwood@android.com> | Mon Sep 27 14:16:44 2010 -0400 |
| tree | 4a458394247e35ae81498c17d450dfa8b53b21a1 | |
| parent | 33357f5477a24cb16bd3dd692fe5ca14755ab033 [diff] | |
| parent | c29919c8d75ad218012daeda62e1e62200cad889 [diff] |
resolved conflicts for merge of c29919c8 to gingerbread-plus-aosp Change-Id: I860b7690c40428839e45e2c2b122661b00d47e0e