Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
authorJohn Stultz <john.stultz@linaro.org>
Mon, 14 Apr 2014 19:01:11 +0000 (12:01 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Mon, 14 Apr 2014 19:01:11 +0000 (12:01 -0700)

Trivial merge