diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-09-23 01:12:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-23 01:12:07 +0000 |
| commit | 45736448db0d870c9fd02fc081a2956294e65bb7 (patch) | |
| tree | e9f24486fe6857f330bcaa3b1054ff7dbd1d8d39 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | baf315e2792589741c8a9791b3c9085ccaf82349 (diff) | |
| parent | 50f9f383a04b259bcd0bef13e54de7424a10402a (diff) | |
Merge changes from topic 'am-90a4f04d22924c9f8592517d32d13be3'
* changes:
Merge "Merge "Remove has_trivial_move trait from StringPool types" am: d333f28397 am: 6f02f57f12" into nyc-dev-plus-aosp am: 8ac28b8659 am: 350d84d484
Merge "Remove has_trivial_move trait from StringPool types" am: d333f28397 am: 6f02f57f12 am: 57ef0a40f1 am: 01496b46d9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions