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

Trivial merge