commit | baaa70bbddd672baa0fe1ca9eae0f04cb8e2d36c | [log] [tgz] |
---|---|---|
author | Fyodor Kupolov <fkupolov@google.com> | Mon Oct 26 23:55:39 2015 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Oct 26 23:55:39 2015 +0000 |
tree | 279c26be9320ce9e4ad73adbb29d5b9b0fc7e5cb | |
parent | 56e9aebc59b5e64e118b74b7528b99f3b56c20d2 [diff] | |
parent | d476b036dafa5af64bd17b5deda8f1e3d1adda64 [diff] |
Merge "Increase wait timeout for ContextWrapperTest" into marshmallow-cts-dev