diff options
| author | Felka Chang <felkachang@google.com> | 2018-11-09 14:21:29 +0800 |
|---|---|---|
| committer | Selim Cinek <cinek@google.com> | 2018-11-09 17:29:40 +0000 |
| commit | 6fa357a529a57d0421df6070d425ccc684603ef0 (patch) | |
| tree | 6a045f79ee2e92ad340676efc9faf7f126a4447e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d96fd153646cc738b05b555c4c0e472254ec7fa7 (diff) | |
| parent | 0cc0d229d0f590fe84c1b7aa8cc8fbf188d8a787 (diff) | |
resolve merge conflicts of 0cc0d229d0f590fe84c1b7aa8cc8fbf188d8a787 to pi-dev-plus-aosp
To add test testHeaderReadFromOldController into
HeadsUpAppearanceControllerTest.java and conflict with
testOperatorNameViewUpdated.
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: If7d7961dbc12346484f3d139bdc808a53abc6c46
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions