Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
authorJohn Stultz <john.stultz@linaro.org>
Mon, 10 Mar 2014 18:35:09 +0000 (11:35 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Mon, 10 Mar 2014 18:35:09 +0000 (11:35 -0700)

Trivial merge