OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Jun 2010 18:33:52 +0000 (11:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Jun 2010 18:33:52 +0000 (11:33 -0700)
Change-Id: I4e06b684dd46c317e1c206e584050dbee20be281

1  2 
build/sdk.atree

diff --cc build/sdk.atree
Simple merge