tree 9fa63fa97a8aef109f08779f156224a1e3e0a200
parent 1188e018479531c2766529772b944f6a63a11989
parent 12af7d51a1a0c4e98955ae58a69552b8f55904eb
author Felipe Leme <felipeal@google.com> 1465410336 +0000
committer android-build-merger <android-build-merger@google.com> 1465410336 +0000

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

Change-Id: I1cdc06fdb732e893ea4829a780efe2a931c74598