diff options
author | Robert Carr <racarr@google.com> | 2016-06-11 01:35:43 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-11 01:35:43 +0000 |
commit | 7b542a21ba1510d5f03d5836c6cbfa00ed4d08d0 (patch) | |
tree | 22f53b931c25ac0bb42e77dfca7fc11175911335 /rs/java/android/renderscript/Script.java | |
parent | 2eeceeed3a01eafe070bf3fb0e45cf89fdf3039f (diff) | |
parent | 938a70142ebb504ef2e079708c48315f80707b53 (diff) |
Merge \"Restore setCropInTransaction HiddenForCrop behavior.\" into nyc-dev
am: 938a70142e
Change-Id: If643cd8c6c4ea1dc9efbf14db8467bd2b4976c06
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions