Merge branch 'linaro-fixes/android-3.10' into 'linaro-android-3.10-lsk'
authorAmit Pundir <amit.pundir@linaro.org>
Tue, 19 Aug 2014 13:21:14 +0000 (18:51 +0530)
committerAmit Pundir <amit.pundir@linaro.org>
Tue, 19 Aug 2014 13:21:14 +0000 (18:51 +0530)

Trivial merge