Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
authorJohn Stultz <john.stultz@linaro.org>
Wed, 26 Mar 2014 17:45:14 +0000 (10:45 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Wed, 26 Mar 2014 17:45:14 +0000 (10:45 -0700)

Trivial merge