diff options
author | Ed Heyl <ed@google.com> | 2011-10-26 08:07:54 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-26 08:07:54 -0700 |
commit | 0dda60d2a0a9fdda1ec5fe58b4caa69e7eb8b9b0 (patch) | |
tree | 09523ff87feb3ef06c5f13264597576d4eff3070 | |
parent | 1fd31d6a2b28559c60e8d79c3bd369fca663f133 (diff) | |
parent | 366238178f7a6d26ce051150f4fb65e533c2fae4 (diff) | |
download | external_libnfc-nxp-0dda60d2a0a9fdda1ec5fe58b4caa69e7eb8b9b0.zip external_libnfc-nxp-0dda60d2a0a9fdda1ec5fe58b4caa69e7eb8b9b0.tar.gz external_libnfc-nxp-0dda60d2a0a9fdda1ec5fe58b4caa69e7eb8b9b0.tar.bz2 |
am 36623817: Merge remote branch \'goog/ics-mr0\' into ics-mr1
* commit '366238178f7a6d26ce051150f4fb65e533c2fae4':
Use a 10s timeout in uart_read() in FW download mode.
0 files changed, 0 insertions, 0 deletions