Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
authorJohn Stultz <john.stultz@linaro.org>
Fri, 13 Dec 2013 00:31:19 +0000 (16:31 -0800)
committerJohn Stultz <john.stultz@linaro.org>
Fri, 13 Dec 2013 00:31:19 +0000 (16:31 -0800)
Pull in updates from AOSP, mostly focused on ION

Signed-off-by: John Stultz <john.stultz@linaro.org>

Trivial merge