diff options
| author | Benedict Wong <benedictwong@google.com> | 2020-05-27 17:56:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-27 17:56:07 +0000 |
| commit | 60d3a5e393ce9e172ffa731110be3c0d57709b60 (patch) | |
| tree | 509e1d51ff3a1a065b0021391dca5813f8b33be8 /opengl/java/android/opengl/Material.java | |
| parent | ef92bf2f6da87e837947e78ea3bc362717490112 (diff) | |
| parent | 8492f014be352c2371492cff1355874986a5d43f (diff) | |
[automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 8f29769362 am: 8492f014be -s ours
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 63d2bfd257 is in history
Change-Id: Icdd3089924d465a8d8dd5cd999bd292d4072f963
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions