| commit | e5c452386ac1324bfb870c6d1136c2ee19393641 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Tue May 23 16:57:59 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 23 16:57:59 2017 +0000 |
| tree | 6754e974fbef312ef52cb5eff5c934c12cfbe095 | |
| parent | 683494427440e142e3f8442404b6b092013a35c8 [diff] | |
| parent | e9caff5a8bef780b1febf4c53a16811e1df6d6f2 [diff] |
Merge "Convert Shader to NativeAllocationRegistry" into oc-dev am: 3afc07ae7b am: e9caff5a8b Change-Id: Iae516c640d5ad4c25b2dabe8c082980d784f7c93