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

Trivial merge