diff options
| author | Victor Chang <vichang@google.com> | 2016-05-23 18:58:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-23 18:58:29 +0000 |
| commit | 1a551d757759200c5300d7042c39189d1a9f08e8 (patch) | |
| tree | b7e945fd4828d1fd070692989fd05524b195a9f6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f0b0c8cfaa525f159b8b9637734196040d681f2b (diff) | |
| parent | 212a9332388975fbc2869b19f6e4cea3967d55c8 (diff) | |
Merge "Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev am: 7c527bf76d am: a3e767a73d" into nyc-mr1-dev-plus-aosp
am: 212a933238
* commit '212a9332388975fbc2869b19f6e4cea3967d55c8':
Change-Id: I1f1f866c91ea730a40f855b131dfda7d6c85a0a5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions