Merge branch 'upstream/android-3.10' into linaro-android-3.10-lsk
authorAmit Pundir <amit.pundir@linaro.org>
Mon, 12 Jan 2015 06:13:21 +0000 (11:43 +0530)
committerAmit Pundir <amit.pundir@linaro.org>
Mon, 12 Jan 2015 06:13:21 +0000 (11:43 +0530)

Trivial merge