commit | ceff2940f42e93e7d836460ce3ff1803e23d6b23 | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Fri Nov 20 04:05:44 2015 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Nov 20 04:05:44 2015 +0000 |
tree | ede95e931d1aed032444766fb18ed277a1a38bd6 | |
parent | 2a2c06e58341c74e934258b140ba4f56e8b57ccb [diff] | |
parent | b8fbd66bfb3dc11239ab55d17b514ea62e6243eb [diff] |
Merge "Fix testSetPreviewTextureBothCallbacks wait timeout" into marshmallow-cts-dev