tree c7323ffd476368c10c91f3ec12f3f66a766f33d2
parent c9154bef9c32ddf269b078dd15d153fe1be1fa42
parent a3703225151c95a32017e66a3b56229059d78626
author David 'Digit' Turner <digit@android.com> 1304439406 -0700
committer Android Code Review <code-review@android.com> 1304439406 -0700

Merge "Add 'emulator' launcher program." into tools_r11