OSDN Git Service

resolved conflicts for merge of c2894474 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Oct 2010 00:45:45 +0000 (17:45 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 11 Oct 2010 00:45:45 +0000 (17:45 -0700)
commit89fbcd72fbe6ef26ea2703f8e338fd198c958ecc
tree6163a99deac8770a25b654a51f28306ac56747fd
parent779d1778b6147ee1b57428af234d1498a26f031e
parentc28944743966b70ace7477ee50f6594f4723d2d3
resolved conflicts for merge of c2894474 to gingerbread-plus-aosp

Change-Id: Ie00785e37809b677d6e8ab44c47e1f26037793d2
api/current.xml