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)
commit9e30117d8a94bddafe135bd9f50af8b3ac7d2e99
tree547cbdb32430d9f2343682b9fa9ed5bfd2ae44e8
parent88f05e8db5f544366cf5418f40b294ef433c8e05
parent59e54ddf3624b972ce990a73c90792f3e3c9dec3
Merge from AOSP

Change-Id: I885abca951326c884d6e64536ebaa3da0220d461