Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev am: f22f7e8b53 am: 91becf6d87

am: 80fb5552d0

Change-Id: I25d90afb3df6796a89f286e86b92db18148f32ba
This commit is contained in:
Fan Zhang
2016-08-12 21:14:32 +00:00
committed by android-build-merger

Diff Content Not Available