Merge branch 'linaro-fixes/android-3.10' into 'linaro-android-3.10-lsk'
authorAmit Pundir <amit.pundir@linaro.org>
Mon, 1 Sep 2014 12:10:51 +0000 (17:40 +0530)
committerAmit Pundir <amit.pundir@linaro.org>
Mon, 1 Sep 2014 12:10:51 +0000 (17:40 +0530)

Trivial merge