diff options
author | Rubin Xu <rubinxu@google.com> | 2017-04-20 17:21:06 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-04-20 17:21:06 +0000 |
commit | 29433e26587bcdd83e4a19ed1b9a3c2ee4a40431 (patch) | |
tree | e64998e33e5532a616b96d989eb6b7ba8c3676d9 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 88ac6d9605083cb08be965fb13db26439b70a2f0 (diff) | |
parent | e95f075924234c6fc1be4151938c3b4201c01b90 (diff) |
Merge "Do not check user escrow state if synthetic password is not enabled yet" into oc-dev am: b156c3a006
am: e95f075924 -s ours
Change-Id: Ieca67d0875caef9639beb576463f7af5a0eb750d
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions