Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
authorJohn Stultz <john.stultz@linaro.org>
Wed, 18 Jun 2014 16:32:43 +0000 (09:32 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Wed, 18 Jun 2014 16:32:43 +0000 (09:32 -0700)
commit0b3d5ff454df314e41cc863e4d08d89aedb74aeb
tree9f05226fd933bb62b4bdc37093d6179bfbae3707
parent7e0967f127480c39317c7ff15e018ce0d7c40774
parent47f7337804ffb4ddf1598c1ccef90ed424ef5930
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10