OSDN Git Service

resolved conflicts for merge of 76aa8d0a to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Wed, 15 Dec 2010 00:23:19 +0000 (16:23 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 15 Dec 2010 00:23:36 +0000 (16:23 -0800)
Change-Id: I7fa43d5b5d52b68baca3e4848cd308fea1d1fb98


Trivial merge