Merge branch 'linaro-fixes/android-3.10' into 'linaro-android-3.10-lsk'
authorAmit Pundir <amit.pundir@linaro.org>
Fri, 5 Dec 2014 06:41:04 +0000 (12:11 +0530)
committerAmit Pundir <amit.pundir@linaro.org>
Fri, 5 Dec 2014 06:41:04 +0000 (12:11 +0530)

Trivial merge