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

Trivial merge