Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
authorJohn Stultz <john.stultz@linaro.org>
Fri, 9 May 2014 22:16:56 +0000 (15:16 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Fri, 9 May 2014 22:16:56 +0000 (15:16 -0700)

Trivial merge