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)
commit34e826718e99d56da38ecd5ffd8873997722fa92
tree286a4a4a32c34e16b09c2df531bd855557b7f084
parent3463d0e1026263d9d740c3324138a346b0c9006d
parent76aa8d0a8bc753b1fffa239609d4364699fec6cc
resolved conflicts for merge of 76aa8d0a to gingerbread-plus-aosp

Change-Id: I7fa43d5b5d52b68baca3e4848cd308fea1d1fb98