Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
authorJohn Stultz <john.stultz@linaro.org>
Mon, 4 Nov 2013 22:46:43 +0000 (14:46 -0800)
committerJohn Stultz <john.stultz@linaro.org>
Mon, 4 Nov 2013 22:46:43 +0000 (14:46 -0800)

Trivial merge