diff options
author | Mark Renouf <mrenouf@google.com> | 2017-01-09 19:48:40 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-09 19:48:40 +0000 |
commit | 2b219437f33eef2efd2dc62b73b01ed740f11f43 (patch) | |
tree | d9961f39b6c6e481b3bb2e66bd0b8fd6fc877b7c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 7fb756ddfeaebeb6e62f0e8325dfd567d961c553 (diff) | |
parent | 14caf48e0fcdfdde44b6f042d03e07ade2caedef (diff) |
Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN am: 9b32a35aa7 am: bf30b430d4" into nyc-mr2-dev-plus-aosp
am: 14caf48e0f
Change-Id: I8d8b238eeade815ef6ad75cbc779bc0871d7dd7e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions