Merge branch 'upstream/android-3.10' into 'linaro-fixes/android-3.10'
authorAmit Pundir <amit.pundir@linaro.org>
Mon, 13 Oct 2014 04:13:42 +0000 (09:43 +0530)
committerAmit Pundir <amit.pundir@linaro.org>
Mon, 13 Oct 2014 04:13:42 +0000 (09:43 +0530)

Trivial merge