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)

Trivial merge