Merge branch 'linaro-fixes/android-3.10' into 'linaro-android-3.10-lsk'
authorAmit Pundir <amit.pundir@linaro.org>
Mon, 10 Nov 2014 05:49:23 +0000 (11:19 +0530)
committerAmit Pundir <amit.pundir@linaro.org>
Mon, 10 Nov 2014 05:49:23 +0000 (11:19 +0530)

Trivial merge