tree 758fe71b4bd25ad4f93215f8922f03aa3ae507b3
parent 2fc9381a2a370142b3559c6c1445588643d6ae60
parent 12af7d51a1a0c4e98955ae58a69552b8f55904eb
author Felipe Leme <felipeal@google.com> 1465410911 +0000
committer android-build-merger <android-build-merger@google.com> 1465410911 +0000

Merge \"Explicitly sets dumpsys timeout.\" into nyc-dev
am: 12af7d51a1

Change-Id: Ieab6b2ad648ff58b3bee7ffc8d4fbc3cfb516225