| commit | 3fc304a335466ebf91b849a6cb5cca23f966076b | [log] [tgz] |
|---|---|---|
| author | Greg Plesur <plesur@google.com> | Thu Oct 13 21:10:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 13 21:10:01 2016 +0000 |
| tree | 39c6caf529d74c384014bbccc995fb3c365afb56 | |
| parent | cacde71514781bf2393ce04731903e3f77467ed1 [diff] | |
| parent | 55a2a0747649224381578a20b10c43809ea8d894 [diff] |
Merge "Increase the timeout for dpm.removeActiveAdmin()." into nyc-mr1-dev am: b266783a8a am: 55a2a07476 Change-Id: I2b9d53f683b67b5d6789b5988e324e76ddd4636f