| commit | 1e8c735d836961bef7b55096505d7e1d0ef272ed | [log] [tgz] |
|---|---|---|
| author | Fyodor Kupolov <fkupolov@google.com> | Tue Oct 27 00:02:21 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 27 00:02:21 2015 +0000 |
| tree | 05e2ac4a0281ffa0fa6c2a29300c374c23bb8d6f | |
| parent | 02e4fd2d77acaed45ba3785c3ef9677cafc8f0b3 [diff] | |
| parent | baaa70bbddd672baa0fe1ca9eae0f04cb8e2d36c [diff] |
Merge "Increase wait timeout for ContextWrapperTest" into marshmallow-cts-dev am: baaa70bbdd * commit 'baaa70bbddd672baa0fe1ca9eae0f04cb8e2d36c': Increase wait timeout for ContextWrapperTest