diff options
| author | Benedict Wong <benedictwong@google.com> | 2020-05-27 17:57:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-27 17:57:33 +0000 |
| commit | a390c893480fd027d3b3b89d4213904cf4c1d447 (patch) | |
| tree | 6f1a65d2b4032fa3ece61db49b2da336cd02c53b /opengl/java/android/opengl/Material.java | |
| parent | 2476044f31933fdf725a87b521fccf834bffad9e (diff) | |
| parent | 0eb605b58c7b4feafff8008e901d323c5e40efac (diff) | |
[automerger skipped] Merge "Add methods for IKEv2/IPsec test mode profiles" into rvc-dev am: 8f29769362 -s ours am: 0eb605b58c -s ours
am skip reason: Change-Id I2511b39b27a1e29ae97907cdb12728d13fb1628f with SHA-1 c13b6f0b03 is in history
Change-Id: I8addd4263844d33ae759bd5d76949bddf37bce57
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions