| commit | 99cb7b10c8ccc53163d60b2c0691e106bb2d419d | [log] [tgz] |
|---|---|---|
| author | Qi Jiang <qijiang@google.com> | Mon Apr 09 22:56:50 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 09 22:56:50 2018 -0700 |
| tree | 3f85828c94e6cadb40e96e73c497f733ddb072ba | |
| parent | 3e831f45b9bd7b50760ca34c6fd62461d8bf0b17 [diff] | |
| parent | 1c542f61afbcb27d3b5d844a6ac10e67c1c3919f [diff] |
Merge "Catch sl4a error when NFC is not available" am: 6530170600 am: 366c84e197 am: 1c542f61af Change-Id: I511d13ba20e2b158a82b37d1fbef0e27f18234ee