Merge tag 'android-4.4.2_r1' into nv-kk-partner
Jean Huang [Tue, 17 Dec 2013 01:12:41 +0000 (17:12 -0800)]

Trivial merge