OSDN Git Service

Merge "Increase the timeout for NfcHidlTargetProfilingTest." am: 6d88fc9a6a am: 62cc5...
authorZhuoyao Zhang <zhuoyao@google.com>
Thu, 26 Jan 2017 04:03:45 +0000 (04:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 04:03:45 +0000 (04:03 +0000)
commitaffc5da8697fc11d4dd18a6f4cece705adbda262
tree68091f75e94fd785768c30593d97b2533e46effd
parente26a280b3977d31586bcb13c9a9b9e5cef56ae65
parentb6492bc46476fd5d2603f041ce35e377d421fa03
Merge "Increase the timeout for NfcHidlTargetProfilingTest." am: 6d88fc9a6a am: 62cc546eec am: 21d5b70212
am: b6492bc464

Change-Id: I10e9cee844367c63f74754ee451b316738f56906