diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-09-20 21:26:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-20 21:26:15 +0000 |
| commit | eb986be8712ac8bedb8afb0865ad98248f700b1f (patch) | |
| tree | 56878314f6ad4da9bbb2ad48fbf1116919238ecb /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | cadce4fe3db8d4bf9e7aeec769c4afa7b077d608 (diff) | |
| parent | ab9a4661faf71c37406c07083399d2b0e020076e (diff) | |
Merge changes from topic 'am-7d2bafcf975f4cb0beff18b39455308b' into nyc-mr1-dev-plus-aosp
* changes:
Merge changes from topic 'n-versioncode' into nyc-dev am: 99ec81ab46 am: 9340130a5e
A little more on issue #30766518: Document what targeting N does am: da6be5b871 am: 3da7e4e563
Cherrypick so we can publish N version code description ASAP am: 491bc2b8d6 am: bae14052a0 -s ours
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions