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)
commitb38c6f06915c69424abb85fbd5c16e418865ed9b
treef486e22499fc5ce7548b76f299ecb91f52baf8ed
parentce5c776ed5ed5c8619930387c5c10ec3f0d53047
parent4155e96bc418753a0c7a25d9ffb6d959d3933dc1
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10