tree 03acedc08c53a4ae85011ad339d61991ffa602b4
parent af58817b1d68778141597a2c425b972d294a9e27
parent 21d5b70212b7e3fff9a1aca957760db34e74d06e
author Zhuoyao Zhang <zhuoyao@google.com> 1485403244 +0000
committer android-build-merger <android-build-merger@google.com> 1485403244 +0000

Merge "Increase the timeout for NfcHidlTargetProfilingTest." am: 6d88fc9a6a am: 62cc546eec
am: 21d5b70212

Change-Id: I96fa7e8a6816a13409b049248db18731ae9caf27