diff options
author | Seigo Nonaka <nona@google.com> | 2017-06-23 12:50:33 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-23 12:50:33 +0000 |
commit | 9dbe595163414b9787dd6213af776ccfd9c1dafa (patch) | |
tree | 11550a12125dc001f8972ec6fd741669be555ff3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 7d24b63f7d0fc4ff633de8ab4a58228d074a252b (diff) | |
parent | 34f12cca788b6610366e2a15bc030bbe01c61632 (diff) |
Merge "Stop loading other package's font by default." into oc-dev am: 824d75e0e1 -s ours am: 2629b0c1a0 -s ours
am: 34f12cca78 -s ours
Change-Id: I101c072d246fa0fce9c0368551f2463d4d548505
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions