OSDN Git Service

resolved conflicts for merge of 882ad42e to eclair-mr2
authorMike Lockwood <lockwood@android.com>
Mon, 7 Dec 2009 15:52:22 +0000 (10:52 -0500)
committerMike Lockwood <lockwood@android.com>
Mon, 7 Dec 2009 15:52:22 +0000 (10:52 -0500)
commit623a5572e894c2114767f5631165354076d0b139
treefb8390f3df34801da2bbf28aa00eb631e4c155f0
parente15968b47a30fb6411a682ac06a5d93ea89011b0
parent882ad42e0de35d86f2361867e3efc497002b73e6
resolved conflicts for merge of 882ad42e to eclair-mr2

Change-Id: I3d14fd9f6bb2b6f3878e519b29db113c37d64587
cleanspec.mk