Merge remote-tracking branch 'android/android-3.10' into linaro-fixes/android-3.10
authorJohn Stultz <john.stultz@linaro.org>
Fri, 4 Apr 2014 23:24:26 +0000 (16:24 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Fri, 4 Apr 2014 23:24:26 +0000 (16:24 -0700)

Trivial merge