resolved conflicts for merge of 106de004 to jb-mr1-dev-plus-aosp
Wink Saville [Tue, 11 Dec 2012 04:08:14 +0000 (20:08 -0800)]
Change-Id: I069420f6eb3dc40779622e929acbc368d4b7aa55


Trivial merge