| commit | b2fd84ad1d470d607af4a83da378d4e317421634 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon Jun 06 09:55:15 2011 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Mon Jun 06 09:55:15 2011 -0700 |
| tree | 7f3004f80d6e46b33317676d8d11b79aa3c6bb69 | |
| parent | fc51aaec82ecedb554d158e4284761c9348d09fd [diff] | |
| parent | b9783b49f4727a0365f2297bb903db8682855adf [diff] |
resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643