| commit | c6e915f2899bb493068d80d3aecd1a3bc180673f | [log] [tgz] |
|---|---|---|
| author | John Stultz <john.stultz@linaro.org> | Mon Oct 10 13:07:37 2011 -0700 |
| committer | John Stultz <john.stultz@linaro.org> | Mon Oct 10 13:07:37 2011 -0700 |
| tree | 2afd47ec3f82393b98e8979b72576bc6fe4a6b9c | |
| parent | 34092e67d6b750c25be4edc5dc92f2534c69540e [diff] |
Fixup bad merges Apparently some of the rebase of the android patches onto 3.1 went badly, so fix up obvious compile issues. Signed-off-by: John Stultz <john.stultz@linaro.org>