OSDN Git Service

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

Change-Id: Idf7c5b89ea14f53336dd51973845500726552dce


Trivial merge