diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:35:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:35:56 +0000 |
| commit | 6c79212afda77801128d94cbf5863396cd2e91b4 (patch) | |
| tree | 2ccd3e5cd0a5778286a63bf9cbbde39dcf0d57eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4761069d536b4a6b5003499277a63bf37d5a12be (diff) | |
| parent | 95d6b195451419e24f190ee0d3286eed84ab227b (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: f79616b427 -s ours am: c29b39b95f -s ours" into nyc-mr1-dev-plus-aosp
am: 95d6b19545 -s ours
* commit '95d6b195451419e24f190ee0d3286eed84ab227b':
Import translations. DO NOT MERGE
Change-Id: Icd0e559f3e6bf7b17c44e5e04523d27eb72449e7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions