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)
commit0c5c18ce48549cadd2021d133a6c0c8534617382
treefe8eb58838daa5113848b56fd93f717a0b839f9c
parent46650262c2342eab6ef01b382741df2d89688ab3
parentd4e564429cb89a90b9d5482af884b0b6a85aa284
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10