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

am: 91becf6d87

Change-Id: I44e1b5af1f4555d4f2483634e525582153c82968
This commit is contained in:
Fan Zhang
2016-08-12 20:40:43 +00:00
committed by android-build-merger

Diff Content Not Available