| commit | ee3420bc124613827af474684c3015d12742c70d | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Tue Apr 05 12:32:50 2011 -0500 |
| committer | Jeff Hamilton <jham@android.com> | Tue Apr 05 12:32:50 2011 -0500 |
| tree | 41ac8e9ea5e6399623dc7f51b63ec0f4193eb425 | |
| parent | b6623abc414ea2a1d1ac3cbfef0c435e3b7e8987 [diff] | |
| parent | 65475f89e14cb0914db336652c345e2847c7cb92 [diff] |
resolved conflicts for merge of 65475f89 to honeycomb-plus-aosp Change-Id: I9f77e84d887dbe84bb94de0fdd369d8de24fbec3