Merge "Fix to issue with NFC VTS-CoreInitiazed test"
am: 827d708109

Change-Id: Ia1917bd567b38278137593bf4cde55cf2dc33c59
tree: f15ee8eb7f49ddb28bb3475ca385aa6dfeb58f1f
  1. 1.1/
  2. extns/
  3. halimpl/
  4. Android.bp
  5. OWNERS