Merge from AOSP
authorJean-Baptiste Queru <jbq@google.com>
Wed, 28 Nov 2012 18:45:54 +0000 (10:45 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 28 Nov 2012 18:46:30 +0000 (10:46 -0800)
Change-Id: I885abca951326c884d6e64536ebaa3da0220d461


Trivial merge