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)
commit5ef3c884d2291f784bc7c08f48112b04ffbb2f8d
tree42b82232dc8d50043dacc3c1ce824f083e732b8c
parent90a332678deb2d8b2aae19aee8b9181f298b503a
parent8069739d23200f68b59570f6c4c5a8ec66f38fab
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10

Pull in updates from AOSP, mostly focused on ION

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