Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
authorJohn Stultz <john.stultz@linaro.org>
Wed, 16 Jul 2014 00:41:18 +0000 (17:41 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Wed, 16 Jul 2014 00:41:18 +0000 (17:41 -0700)

Trivial merge