Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
authorJohn Stultz <john.stultz@linaro.org>
Fri, 3 Jan 2014 21:22:53 +0000 (13:22 -0800)
committerJohn Stultz <john.stultz@linaro.org>
Fri, 3 Jan 2014 21:22:53 +0000 (13:22 -0800)

Trivial merge