| commit | 80fb5552d030122eb30b3ecf2110d9bf4e2de471 | [log] [tgz] |
|---|---|---|
| author | Fan Zhang <zhfan@google.com> | Fri Aug 12 20:40:43 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 12 20:40:43 2016 +0000 |
| tree | 639f0124f1a74a88572029221749c74f3afd211e | |
| parent | 96f37df6d966cd4ed9f2e03181bfb109a63a84a4 [diff] | |
| parent | 91becf6d87c5e7ae5882c3364e884295ceaed3f4 [diff] |
Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev am: f22f7e8b53 am: 91becf6d87 Change-Id: I44e1b5af1f4555d4f2483634e525582153c82968