OSDN Git Service

Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev am: f22f7...
authorFan Zhang <zhfan@google.com>
Fri, 12 Aug 2016 20:40:43 +0000 (20:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 20:40:43 +0000 (20:40 +0000)
commit80fb5552d030122eb30b3ecf2110d9bf4e2de471
tree639f0124f1a74a88572029221749c74f3afd211e
parent96f37df6d966cd4ed9f2e03181bfb109a63a84a4
parent91becf6d87c5e7ae5882c3364e884295ceaed3f4
Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev am: f22f7e8b53
am: 91becf6d87

Change-Id: I44e1b5af1f4555d4f2483634e525582153c82968