OSDN Git Service

Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report...
authorFelipe Leme <felipeal@google.com>
Tue, 25 Oct 2016 20:49:46 +0000 (20:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Oct 2016 20:49:46 +0000 (20:49 +0000)
am: 7781eccbc3

Change-Id: If9f104497a20203c6fd854091082672826857b52


Trivial merge