Merge branch 'android-3.10' into dev-kernel-3.10
Sumit Singh [Fri, 10 Oct 2014 14:12:57 +0000 (19:12 +0530)]
Bug 200041789

Change-Id: I72f5eddd6255c20f22e19a48d69ea1ccbee5554b
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>


Trivial merge