tree 6837f3a35bc8a3ab7afeb089e4cbed216769be77
parent c272430960047de4e9b2f169fb053bd0aedce3b1
parent babba1868773eba5edf8a8e335b8e109a32292e0
author Andy McFadden <fadden@android.com> 1347481620 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347481621 -0700

Merge "Fix emulator" into jb-mr1-dev