OSDN Git Service

Merge "Fix infinite AVD not running" into nyc-mr1-dev am: a5dc817c75
authorDoris Liu <tianliu@google.com>
Mon, 8 Aug 2016 21:37:31 +0000 (21:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Aug 2016 21:37:31 +0000 (21:37 +0000)
am: 186c4e6bed

Change-Id: Ib57dc83e6e2fef341187f5dd97dc6dab19ce2629


Trivial merge