| commit | f82ab8bea4c914c567a3487297fd4914561978a1 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Mon Jan 25 10:00:32 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jan 25 10:00:32 2016 +0000 |
| tree | ee81730ac8d87e5597f6b081a5798772b56915f6 | |
| parent | 7d1ca068a229191653f66e440f4209a2a2c3f05e [diff] | |
| parent | cf2f9d0966af01eb269b9ce6f2d08870647dd22f [diff] |
Merge "Implementation of HCE for NFC-F." am: e168012ff2 am: cf2f9d0966 * commit 'cf2f9d0966af01eb269b9ce6f2d08870647dd22f': Implementation of HCE for NFC-F.