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