diff options
| author | Fan Zhang <zhfan@google.com> | 2018-08-28 11:38:27 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-28 11:38:27 -0700 |
| commit | 6e65a324687c33c8a4ff9b9db2dc41e3fdc28992 (patch) | |
| tree | 3d1a70f07e1406b62bbb5e0027c6d03c5794435d /src/com/android/settings/nfc/AndroidBeamPreferenceController.java | |
| parent | 51a72d4c38ebe6dd36665e5b780d2b856eba59e6 (diff) | |
| parent | fcaf926dc16e3a17ca310e80919596a56db91315 (diff) | |
| download | packages_apps_Settings-6e65a324687c33c8a4ff9b9db2dc41e3fdc28992.tar.gz packages_apps_Settings-6e65a324687c33c8a4ff9b9db2dc41e3fdc28992.tar.bz2 packages_apps_Settings-6e65a324687c33c8a4ff9b9db2dc41e3fdc28992.zip | |
[automerger skipped] Merge "DO NOT MERGE Fix color_lint errors"
am: fcaf926dc1 -s ours
Change-Id: I4d66ba0b4164b5b700c7671f5d249c30ad38722e
Diffstat (limited to 'src/com/android/settings/nfc/AndroidBeamPreferenceController.java')
0 files changed, 0 insertions, 0 deletions