| commit | e6cd0c747e76723bc51a23925c239ae10f9d3b5c | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu May 19 12:48:14 2011 -0700 |
| committer | Kenny Root <kroot@google.com> | Thu May 19 12:48:14 2011 -0700 |
| tree | 6fd4fa9f3e207f5a0aaf50edf972374196390a49 | |
| parent | 0a36cec642fb58e295d0608026890d95d0ae3cc0 [diff] | |
| parent | 2433c443bb5fe96d9a39b59e10e3c03d791e2278 [diff] |
resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1