| commit | 91becf6d87c5e7ae5882c3364e884295ceaed3f4 | [log] [tgz] |
|---|---|---|
| author | Fan Zhang <zhfan@google.com> | Fri Aug 12 20:21:31 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 12 20:21:31 2016 +0000 |
| tree | e70ecbc19eb2f5c00b27c310e2bb6e1b69910265 | |
| parent | d9f35ed984477343b021b2cf126778e34ec87012 [diff] | |
| parent | f22f7e8b530e042352b625d4b591568f9c9aa324 [diff] |
Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev am: f22f7e8b53 Change-Id: I892a2e9b741b44b462bd30581ad0d7c36e1db514