Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
authorAmit Pundir <amit.pundir@linaro.org>
Fri, 5 Dec 2014 06:36:44 +0000 (12:06 +0530)
committerAmit Pundir <amit.pundir@linaro.org>
Fri, 5 Dec 2014 06:36:44 +0000 (12:06 +0530)

Trivial merge