Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
authorJohn Stultz <john.stultz@linaro.org>
Thu, 7 Aug 2014 17:32:25 +0000 (10:32 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Thu, 7 Aug 2014 17:32:25 +0000 (10:32 -0700)
commitb738a3e88049258f2c3de4e3fcf181100cb558a5
tree575464e13d1d178fc34c0f2f19de9118712ffa51
parent30dc17b47c2f5b12279f1db8935ae2e6d35af8ea
parentdc0cf1216b3db4617610ecee67185de0dade9552
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10