| commit | f6bbefd581a28c2b3c8db74efe66eabdc23ab0b3 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Apr 12 10:27:15 2011 -0700 |
| committer | Kenny Root <kroot@google.com> | Tue Apr 12 10:27:15 2011 -0700 |
| tree | a3402cd0e7a2da9b63a6ca702bb7d9c8533bf223 | |
| parent | 77e4ad4610238db874c89cef077ba833fb04020c [diff] | |
| parent | 8a1a61517645ea989b9045eb209ba1d6fdc23cd8 [diff] |
resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53