OSDN Git Service

Merge "Fix tools_r10: some emulator files moved to development.git" into tools_r10
authorRaphaël Moll <ralf@android.com>
Thu, 5 May 2011 23:47:33 +0000 (16:47 -0700)
committerAndroid Code Review <code-review@android.com>
Thu, 5 May 2011 23:47:33 +0000 (16:47 -0700)

Trivial merge