diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-08-01 21:47:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-01 21:47:46 +0000 |
| commit | 213d4ba8950cdebda1a265972356917bd8ca62d3 (patch) | |
| tree | 9ae7056502c33ad4d59f816b15fa98e6b5ac65e5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 921891518a7665cd4d286a356b3e26419e84d148 (diff) | |
| parent | 0c2405ebf86edd10e6a6843e7d4572be2401de9d (diff) | |
Merge changes from topic 'am-b66c4552aecc498fa98e74359e122115'
* changes:
Merge \\"Prevent brightness changes before boot complete.\\" into nyc-mr1-dev am: fbd93027e4 am: 6d0c9ffc5c am: 6108fe0cb9
Prevent brightness changes before boot complete. am: 9f818ea463 am: 16890dd980 am: 3905506938
Merge \\"Cap minimum visibilty of floating windows by the real size.\\" into nyc-mr1-dev am: 7f96551b03 am: 8616408535 am: e4c00dd151
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions