Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
authorJohn Stultz <john.stultz@linaro.org>
Thu, 30 Jan 2014 19:11:28 +0000 (11:11 -0800)
committerJohn Stultz <john.stultz@linaro.org>
Thu, 30 Jan 2014 19:11:28 +0000 (11:11 -0800)

Trivial merge