| commit | 6a0586249ccca1d610d648ab95f1bf82ae81da66 | [log] [tgz] |
|---|---|---|
| author | Fyodor Kupolov <fkupolov@google.com> | Tue Oct 27 00:13:00 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 27 00:13:00 2015 +0000 |
| tree | 9b59e1e9bc1e94b0507215fd30816a5a76700fcd | |
| parent | acd48f3c9d1e34a697fb47303706eedc18642d07 [diff] | |
| parent | dd108232a94e98da148aee4d357dfe01698ab325 [diff] |
Merge "Increase wait timeout for ContextWrapperTest" into marshmallow-cts-dev am: baaa70bbdd am: 1e8c735d83 am: 201f50eeb3 am: dd108232a9 * commit 'dd108232a94e98da148aee4d357dfe01698ab325': Increase wait timeout for ContextWrapperTest