Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
authorJohn Stultz <john.stultz@linaro.org>
Fri, 13 Dec 2013 02:52:34 +0000 (18:52 -0800)
committerJohn Stultz <john.stultz@linaro.org>
Fri, 13 Dec 2013 02:52:34 +0000 (18:52 -0800)
commitaf3c969e503a355a0ba4f9c6b98a4c0dd20705ab
treeef0a05b11a83f82df084c2f0f3090e3b19d015e4
parent5ef3c884d2291f784bc7c08f48112b04ffbb2f8d
parent8f1c42284159ebd6851e1e75507f2ad6fba87d0f
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10