tree eea022d64ff28df55ce3bccb39e0cc497dbc2f22
parent 9268b936861499ac6b565b083549d41d4ac3ee0c
parent 53b345dd227578b5cb15fe59f2437785f3120d48
author Martijn Coenen <maco@google.com> 1492141248 +0000
committer android-build-merger <android-build-merger@google.com> 1492141248 +0000

Merge "Add NfcNci to default builds." into oc-dev
am: 53b345dd22

Change-Id: I009dce5613b66b5bf8bcc63a6945a47c3ada9252