commit | d3828df964e542533765b23f9a343657c7860e17 | [log] [tgz] |
---|---|---|
author | John Stultz <john.stultz@linaro.org> | Fri Aug 19 16:41:55 2011 -0700 |
committer | John Stultz <john.stultz@linaro.org> | Fri Aug 19 16:41:55 2011 -0700 |
tree | a7c34aae8835dc9db8a0df8adafdffe9ea85f651 | |
parent | 7c52cc1dd1b8930107cce801a161df10b8a34275 [diff] | |
parent | efcf89c8eb62b7c0c5976cb94f892c891afea199 [diff] |
Merge branch 'upstream/android-3.0' into linaro-android-3.0