diff options
author | Jason Monk <jmonk@google.com> | 2017-05-01 13:31:26 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-01 13:31:26 +0000 |
commit | 16c981ea4356238e95401a6e77b4519d1e433c1b (patch) | |
tree | d7e5bf574cfa14dd66a4e10c368bfe1832b09a3e /rs/jni/android_renderscript_RenderScript.cpp | |
parent | 5642a6559b20dd72fc5af187c08ad3a68b595f03 (diff) | |
parent | 030107f0bdebb1d52838baab87b5d0146e6586b4 (diff) |
Merge "Fix flaky test?" into oc-dev
am: 030107f0bd
Change-Id: I3ae44198c1f15967b8a774a5166c678c0be0ab47
Diffstat (limited to 'rs/jni/android_renderscript_RenderScript.cpp')
0 files changed, 0 insertions, 0 deletions