OSDN Git Service

Merge commit 'e897c1b4' into manualmerge
authorDirk Dougherty <ddougherty@google.com>
Wed, 16 Dec 2009 07:27:22 +0000 (23:27 -0800)
committerDirk Dougherty <ddougherty@google.com>
Wed, 16 Dec 2009 07:27:22 +0000 (23:27 -0800)
commitb0270a8dac2fb007f51feb4b40c9fb427eb1b412
treece4430844b2a89c3443a9149b761a4a5ba074d01
parent891890c469dd34de8c52a16dced67e18bb69c44e
parentd56d7de52742ee502244eb3dec7db6ba43c9b4b9
Merge commit 'e897c1b4' into manualmerge

Conflicts:
samples/ApiDemos/src/com/example/android/apis/app/_index.html