Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
authorJohn Stultz <john.stultz@linaro.org>
Tue, 22 Jul 2014 17:10:19 +0000 (10:10 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Tue, 22 Jul 2014 17:10:19 +0000 (10:10 -0700)

Trivial merge