Merge branch 'upstream/android-3.10' into 'linaro-fixes/android-3.10'
authorAmit Pundir <amit.pundir@linaro.org>
Mon, 3 Nov 2014 06:11:53 +0000 (11:41 +0530)
committerAmit Pundir <amit.pundir@linaro.org>
Mon, 3 Nov 2014 06:11:53 +0000 (11:41 +0530)

Trivial merge