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

am: f22f7e8b53

Change-Id: I892a2e9b741b44b462bd30581ad0d7c36e1db514
This commit is contained in:
Fan Zhang
2016-08-12 20:21:31 +00:00
committed by android-build-merger

Diff Content Not Available