diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2018-01-24 13:02:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-24 13:02:16 +0000 |
| commit | e1350ba9ea74b5389c4bf154ca24c0f35bca56ad (patch) | |
| tree | 036d0753b7233e13479db6348e874e08d8ae92c7 /libs/hwui/pipeline/skia/SkiaPipeline.cpp | |
| parent | ae992b6392c10134fe250d32f0d7e85e21998e6f (diff) | |
| parent | b5928a2b810f82d907dadec57e3e69c18dd5d2d9 (diff) | |
Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" am: 1f568c14ac am: b91d1b3e3a
am: b5928a2b81 -s ours
Change-Id: Ia781d4799c9b4df316a9617055f99dbdf3e51a30
Diffstat (limited to 'libs/hwui/pipeline/skia/SkiaPipeline.cpp')
0 files changed, 0 insertions, 0 deletions