tree 190bdb0d954f3dbe952c94895d147c0df2145073
parent 0c8a719be79b979a039abaf24432de6fbc9b13e6
parent 183e927350a14945e13ab217e16ab5dce20349f3
author Jesse Hall <jessehall@google.com> 1335541768 -0700
committer android code review <noreply-gerritcodereview@google.com> 1335541769 -0700

Merge "Fix standalone emulator build."