Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
authorJohn Stultz <john.stultz@linaro.org>
Thu, 30 Jan 2014 19:09:50 +0000 (11:09 -0800)
committerJohn Stultz <john.stultz@linaro.org>
Thu, 30 Jan 2014 19:09:50 +0000 (11:09 -0800)

Trivial merge