diff options
| author | Scott Lobdell <slobdell@google.com> | 2019-02-19 10:33:50 -0800 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2019-02-19 11:36:09 -0800 |
| commit | 81b587a542e8381268a9ba8e7461712ef23cd11f (patch) | |
| tree | bace051dc4f3efad7dcd091ea0481167815bfaa7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bf4a1865530dd9a1e4b203d4e9d67fce0958c3fa (diff) | |
| parent | 13327cc461d8f54550866bc404a99205f95ab92f (diff) | |
Merge QP1A.190212.003
Conflicts:
core/java/android/view/SurfaceControl.java
media/java/android/media/MediaCodecInfo.java
packages/SettingsLib/res/values/strings.xml
services/core/java/com/android/server/am/ActiveServices.java
services/core/java/com/android/server/am/OomAdjuster.java
services/core/java/com/android/server/audio/AudioDeviceInventory.java
services/core/java/com/android/server/display/LocalDisplayAdapter.java
services/core/java/com/android/server/wm/ActivityDisplay.java
services/core/java/com/android/server/wm/DisplayPolicy.java
Change-Id: Idc7582978996d2f7c44f599f221e8d7cc9eedf43
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions