diff options
| author | Jordan Liu <jminjie@google.com> | 2021-01-26 00:46:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-26 00:46:10 +0000 |
| commit | 7a58fa1702c826f3da8b8257356038f16b4d669c (patch) | |
| tree | bf186000f4d55c586613ca86c0d26820821466e3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c3a696c11f98a453ceabe98712f8b7886bf6661a (diff) | |
| parent | b5dab8575311f9ea7f42f5d255461c64e51ce977 (diff) | |
[automerger skipped] Merge "Add carrier config for carrier key" am: 11dff58d5e am: b24ba046ee am: b5dab85753 -s ours
am skip reason: Change-Id I89d88daf2022672bf27125baae0247b75638bb6e with SHA-1 762fe4b0e0 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556751
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I88c0920510bbfe1ad403346f4d615f9f0ce6e020
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions