| commit | c60c1bafa0c20166c53666655e2dea7ff5bfd157 | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@android.com> | Fri Sep 03 13:22:38 2010 -0700 |
| committer | Doug Zongker <dougz@android.com> | Fri Sep 03 13:22:38 2010 -0700 |
| tree | 7894565f9460b2bb2f88a345e645263fc546315f | |
| parent | f06675e2a47d0e9322f8a619e84f72882cec039d [diff] | |
| parent | a4a50996acce7aaefc268e702eebdbacb0bbf561 [diff] |
resolved conflicts for merge of a4a50996 to master Change-Id: I52c617ff43aaf9e86b8fb7a2e9c305127566971a