Merge branch 'android-t114-3.4-rebased' into android-t114-3.4
Varun Wadekar [Tue, 24 Jul 2012 05:36:26 +0000 (10:36 +0530)]

Trivial merge