Merge "Fix to issue with NFC VTS-CoreInitiazed test" am: 827d708109 am: 76204acc2a
am: 1256c86990

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