Merge branch 'upstream/android-3.10' into 'linaro-fixes/android-3.10'
authorAmit Pundir <amit.pundir@linaro.org>
Mon, 8 Sep 2014 05:33:45 +0000 (11:03 +0530)
committerAmit Pundir <amit.pundir@linaro.org>
Mon, 8 Sep 2014 05:33:45 +0000 (11:03 +0530)

Trivial merge