| commit | 7043ef8c34264b4f3b05b76425ced0b89500b19b | [log] [tgz] |
|---|---|---|
| author | Qi Jiang <qijiang@google.com> | Mon Apr 09 23:04:44 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 09 23:04:44 2018 -0700 |
| tree | 0747d9300bfc7a72ec26e48c489669e1745ec1d8 | |
| parent | 212a3bae0476dea4d7f305e40759d60f8e92c929 [diff] | |
| parent | c6afc689ed2e6267ef1467a7b64050a3c0bb2992 [diff] |
Merge "Catch sl4a error when NFC is not available" am: 6530170600 am: 366c84e197 am: 1c542f61af am: 99cb7b10c8 am: c6afc689ed Change-Id: I9764fe9f421242c28f0531c5f054254426f9fddc