tree e5907696f5b09aa22d4ea5915bcb62f10252c538
parent dfc9df466fdd6b830b500326a7368f0c46134e11
parent 7781eccbc353c87aeddf24932194e9f2f22f1dff
author Felipe Leme <felipeal@google.com> 1477428586 +0000
committer android-build-merger <android-build-merger@google.com> 1477428586 +0000

Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev
am: 7781eccbc3

Change-Id: If9f104497a20203c6fd854091082672826857b52