Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
authorJohn Stultz <john.stultz@linaro.org>
Fri, 13 Dec 2013 02:52:34 +0000 (18:52 -0800)
committerJohn Stultz <john.stultz@linaro.org>
Fri, 13 Dec 2013 02:52:34 +0000 (18:52 -0800)

Trivial merge