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

Trivial merge