Merge branch 'linaro-fixes/android-3.10' into linaro-android.3.10-lsk
authorJohn Stultz <john.stultz@linaro.org>
Mon, 4 Nov 2013 22:48:40 +0000 (14:48 -0800)
committerJohn Stultz <john.stultz@linaro.org>
Mon, 4 Nov 2013 22:48:40 +0000 (14:48 -0800)
commit354d86f4daecdc3553830e553f6fc17add736234
treef486e22499fc5ce7548b76f299ecb91f52baf8ed
parenta4b2b620070eb156f75c7d4b276e1acd8b7b3040
parentb38c6f06915c69424abb85fbd5c16e418865ed9b
Merge branch 'linaro-fixes/android-3.10' into linaro-android.3.10-lsk

Merge "official" android-3.10 branch in w/ older experimental/android-3.10
to update lsk targetted branch to the official branch w/o any rebase trouble.

Signed-off-by: John Stultz <john.stultz@linaro.org>