diff options
author | Robert Carr <racarr@google.com> | 2016-04-04 18:39:30 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-04-04 18:39:30 +0000 |
commit | 3680e88cb5b7f4ee1c2fe3e206b9cc2de3247f5c (patch) | |
tree | 7016fcae740db90c29b65e55bccb9eb693746f29 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 17b32c44ea2e0e0618048adc26dc3b85291788ba (diff) | |
parent | 84e69c3bbb21c35b9b42e90ae40356a4e889235b (diff) |
Merge changes I7d406cc8,Id6cf70ea into nyc-dev
am: 84e69c3
* commit '84e69c3bbb21c35b9b42e90ae40356a4e889235b':
Do not set docked divider as IME target.
Fix IME adjustment for docked.
Change-Id: Ib75477a44059e928392aeb46a23472aff7c7dfa3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions