Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
authorJohn Stultz <john.stultz@linaro.org>
Sat, 5 Apr 2014 00:05:13 +0000 (17:05 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Sat, 5 Apr 2014 00:05:13 +0000 (17:05 -0700)

Trivial merge