Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
authorJohn Stultz <john.stultz@linaro.org>
Fri, 13 Dec 2013 00:32:07 +0000 (16:32 -0800)
committerJohn Stultz <john.stultz@linaro.org>
Fri, 13 Dec 2013 00:32:07 +0000 (16:32 -0800)

Trivial merge