diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-08-01 00:41:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-01 00:41:28 +0000 |
| commit | 1680e5a56eabdebcdca94738428d2daf049e5ca8 (patch) | |
| tree | 410214c0ac1e3c47cd79233899e5a0ac76669d47 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2729912a3580854547f48de0bd5ef21f9292be46 (diff) | |
| parent | ba048208e561892e15a4bf284ab49e4977025bd2 (diff) | |
Merge changes from topic 'am-6a441a334fc44df4b5ce76e9c455027d' into oc-mr1-dev
* changes:
Merge "Show error code in WFC error notification." into oc-dr1-dev am: d2063214a5
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev am: 0891411cfd
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions