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

Trivial merge