OSDN Git Service

Merge "Fix emulator" into jb-mr1-dev
authorAndy McFadden <fadden@android.com>
Wed, 12 Sep 2012 20:27:00 +0000 (13:27 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 12 Sep 2012 20:27:01 +0000 (13:27 -0700)
commit2c7c8ba56ad9c0c08fde6f86771475f03a03e6fd
tree6837f3a35bc8a3ab7afeb089e4cbed216769be77
parentc272430960047de4e9b2f169fb053bd0aedce3b1
parentbabba1868773eba5edf8a8e335b8e109a32292e0
Merge "Fix emulator" into jb-mr1-dev