| commit | bdd265ba5fe6b2bf632a7a6eb6df9e187a56126a | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Tue Jan 25 10:20:02 2011 -0800 |
| committer | Nick Pelly <npelly@google.com> | Tue Jan 25 10:20:02 2011 -0800 |
| tree | 710b0a2606af14123f404163809b66407eb565e9 | |
| parent | 8bfdd9a65102c13e6a0786d16bf27083be8a98ff [diff] | |
| parent | 12619677b0afafa077ed92fa92374bc4d8e63884 [diff] |
resolved conflicts for merge of 12619677 to honeycomb-plus-aosp Change-Id: I3469ca28b32dd2a8e8011f6f50f9297ba07e933e