| commit | 2213bb43ccfe3b6e4f45acbbd537ec8e56c9a1a4 | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Tue Jan 25 18:00:41 2011 -0600 |
| committer | Jeff Hamilton <jham@android.com> | Tue Jan 25 18:00:41 2011 -0600 |
| tree | 6ef0a8feb57c4112b12022e195ae0182622cfb22 | |
| parent | ab88cf103d40c33751b3e15242bad065e0e0486d [diff] | |
| parent | a18edb2a7685eca6e2de7d4e05290953271e7abd [diff] |
resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp Change-Id: Idc241a61ea3f506f8c0877f4dcdabb89a2635c13