| commit | c6afc689ed2e6267ef1467a7b64050a3c0bb2992 | [log] [tgz] |
|---|---|---|
| author | Qi Jiang <qijiang@google.com> | Mon Apr 09 23:00:42 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 09 23:00:42 2018 -0700 |
| tree | 69c9a77335d96caf6667f5f9a9ccef86763fb5dd | |
| parent | 9c9ad0f8d4a42b68877428ac2b67171ca9bb36fb [diff] | |
| parent | 99cb7b10c8ccc53163d60b2c0691e106bb2d419d [diff] |
Merge "Catch sl4a error when NFC is not available" am: 6530170600 am: 366c84e197 am: 1c542f61af am: 99cb7b10c8 Change-Id: Ibaf995b68b91a97a0f894849845e5d7191970c31