diff options
| author | Ruslan Tkhakokhov <rthakohov@google.com> | 2020-04-29 00:24:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-29 00:24:10 +0000 |
| commit | 4cd7d38019cb8a02f25cc88058ab0e35423608c4 (patch) | |
| tree | 783574f07a5ec04fa9a35bf1f8b74308d4e0d280 /opengl/java/android/opengl/Material.java | |
| parent | b744969864997dd3885bd080ea7a82b63ef6382a (diff) | |
| parent | b2e374e1bbf026368bc9eba4e5c98b3350eaca87 (diff) | |
Merge "Special-case backup/restore of replaced settings" into rvc-dev am: c3a77a143c am: b2e374e1bb
Change-Id: I191089e188b40bd82ea9714659d6ec3343520af2
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions