diff options
| author | Joe LaPenna <jlapenna@google.com> | 2016-12-22 21:58:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-22 21:58:32 +0000 |
| commit | a780aec23e02b284c55db75d43057cd50389c2ac (patch) | |
| tree | 1a6d2fae14e0274a58011b83857016c7e4bf0ea2 /tools/aapt2/diff/Diff.cpp | |
| parent | 4bab824ca6eb0a9de91a12afc82a263c2a4803cf (diff) | |
| parent | dfee8e5f2d7b4bce4d2d3cd85e8a4505b321747f (diff) | |
Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f am: 6f87331902 am: 715acea102
am: dfee8e5f2d -s ours
Change-Id: I20a62e19cd4c7645122822da41a3693f4fc584f8
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions