diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-08-10 22:08:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-08-10 22:08:26 +0000 |
| commit | 0c7d4fd08095446f6eafb78661d830a0bb78e14a (patch) | |
| tree | e4d07b20e5d390fe6678c605f23c5f38ebded4b2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 56b5cb91ba484f8ea6ad9d3170d98911d4f9aa77 (diff) | |
| parent | 22f88263efee534c7b99681d42118400342e2555 (diff) | |
Merge changes from topic "am-230b930766e545f0940a7cadf39805ec"
* changes:
[automerger skipped] Merge changes from topic "back111085900" into oc-dev am: f0095ec4d6 am: 5e8e47d4f8 am: 3375c14aef -s ours am: 5c16aa778a -s ours am: 6ff3b366f9 -s ours
[automerger skipped] DO NOT MERGE. Execute "strict" queries with extra parentheses. am: 5a55a72fcd am: 628667ac86 am: d270842f22 -s ours am: a0bda20ae0 -s ours am: d3a09ba08c -s ours
[automerger skipped] [automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09 am: c09bb997e8 am: 424304f893 am: b2e2b1386f skipped: a2ad2596b7 am: 4ccfb1d0aa am: efe1afbf93 am: 2adafa92bc -s ours am: 205895e6e8 -s ours am: 7bbb5456ed -s ours
[automerger skipped] [automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am: 286fd5652a am: 8ecd22c0a4 am: 97d0d2c209 am: ca5fd693bc skipped: 19d2af61df am: f5c1a7ca27 am: b2ed78a197 am: 798655e2e1 -s ours am: b630be0b51 -s ours am: 74b6d52380 -s ours
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions