Merge "Merge branch 'remotes/android/android-3.10' into dev-kernel-3.10" into dev...
Mitch Luban [Fri, 3 Jan 2014 23:04:49 +0000 (15:04 -0800)]

Trivial merge