Merge "Merge branch 'android-3.10' into 'dev-kernel-3.10'" into dev-kernel-3.10
Bharat Nihalani [Fri, 15 May 2015 17:08:00 +0000 (10:08 -0700)]

Trivial merge