OSDN Git Service

resolved conflicts for merge of 1bc98ccb to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Mon, 22 Nov 2010 21:34:59 +0000 (13:34 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 22 Nov 2010 21:34:59 +0000 (13:34 -0800)
commit24dc936346b4a31005ac28c4bd464320cca9320a
tree59110104507b3dcb829af8b124e8c036b339b2c2
parent9f1a7f933dbf3446d29cbbff959a29f0ab49b308
parent1bc98ccb76c147c46bd666f05247eb11e2847d4b
resolved conflicts for merge of 1bc98ccb to gingerbread-plus-aosp

Change-Id: Ief9ec3d0472660e26864e082e03c26e09a043b9d
libc/Android.mk