tree a6b0931b39552679225178b55336de6b92ca31f4
parent a2e315be959a55cd8cb6c2ee470efc44dd443a6d
parent 87b869ece20065ec3b47b350212e51f8cf866ff0
author Philip Milne <pmilne@google.com> 1317946868 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1317946868 -0700

Merge "Move Activity1 and Activity2 to API Demos area in development/samples."