diff options
| author | Adrian Roos <roosa@google.com> | 2016-06-01 23:48:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 23:48:55 +0000 |
| commit | 3a866db8a1f4e546f0ed1b1399a68c579b06941b (patch) | |
| tree | 95f1ba11f8922c828b4a15a2d660e290c59edee6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 86db54af759d8dc2d2c0d45dea786e2a1b94fd95 (diff) | |
| parent | 0eb85b9d7cbac4122fb56a60b8ace2f0913536d9 (diff) | |
Merge "Merge "AppError: Change "close" to "close app"" into nyc-dev am: b4cd4650cf am: 62eb79e6c8" into nyc-mr1-dev-plus-aosp
am: 0eb85b9d7c
* commit '0eb85b9d7cbac4122fb56a60b8ace2f0913536d9':
AppError: Change "close" to "close app"
Change-Id: I29f2ce210d661c95373b0f754d8205facfe9b79e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions