tree 03acedc08c53a4ae85011ad339d61991ffa602b4
parent 4aceb63bc7a80e3b28adfca18ac42f69f498708c
parent 54abf5632a445ea1477dead989dc5ad61a5e8550
author Zhuoyao Zhang <zhuoyao@google.com> 1485402726 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1485402727 +0000

Merge "Increase the timeout for NfcHidlTargetProfilingTest."