diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-07-29 16:49:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-29 16:49:18 +0000 |
| commit | f320ff3722fc287a2b0e4259a9fa49cf2ca7369b (patch) | |
| tree | 53be04a8382c7e75e0d0290b1bd8d3c4af94bffb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 368a25bbc4cfafe52da0c4a31bff64f02382dee8 (diff) | |
| parent | cef86a23d9ff24efd70d7bf989556df4ad2e78d9 (diff) | |
Merge changes from topic 'am-814b66751ec643389cdf20694182197c'
* changes:
Merge \\\"Default fingerprint swipe to disabled.\\\" into nyc-mr1-dev am: 781f4386dc am: f7f4dfea71 am: 69c6ee6331
Default fingerprint swipe to disabled. am: d01217c0c2 am: fd8273d53d am: 9bf2c7607e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions