diff options
author | Bonian Chen <bonianchen@google.com> | 2019-11-25 05:53:45 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-11-25 05:53:45 -0800 |
commit | 8efd95c41394fc560d08505a2b14c8a65a64679b (patch) | |
tree | fe24debcf95ce65d7f9f24b0abcfee4a2eb1266c /src/com/android/settings/development/ShowRefreshRatePreferenceController.java | |
parent | c2302a3d93e3e692b5fabc8ffa3dcee275f756f2 (diff) | |
parent | d7f0fb6cc16222c3a4d135dd2396599fad2366ab (diff) |
Merge "[Settings] Fix conflict of AOSP merge on wifi call" am: 95e1c8d099
am: d7f0fb6cc1
Change-Id: Ic6268671ff092174866dbd6341a9d7113bd2a4bd
Diffstat (limited to 'src/com/android/settings/development/ShowRefreshRatePreferenceController.java')
0 files changed, 0 insertions, 0 deletions