tree ede95e931d1aed032444766fb18ed277a1a38bd6
parent 2a2c06e58341c74e934258b140ba4f56e8b57ccb
parent b8fbd66bfb3dc11239ab55d17b514ea62e6243eb
author Daniel Xie <dxie@google.com> 1447992344 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1447992344 +0000

Merge "Fix testSetPreviewTextureBothCallbacks wait timeout" into marshmallow-cts-dev