Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
authorJohn Stultz <john.stultz@linaro.org>
Thu, 7 Aug 2014 17:32:25 +0000 (10:32 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Thu, 7 Aug 2014 17:32:25 +0000 (10:32 -0700)

Trivial merge