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)
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>

Trivial merge