diff options
| author | Filip Gruszczyński <gruszczy@google.com> | 2014-03-06 00:30:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 00:30:17 +0000 |
| commit | d54530e9cecda7bc69d6479bae4c48189bcf50e9 (patch) | |
| tree | e27df749b6eb8be4c7b5e42f9ac2a4c14e1b9fe1 /rs/java/android/renderscript/RenderScript.java | |
| parent | a05e752615fbfb50196d59dfb9c96dc7cf6c63f1 (diff) | |
| parent | 1ae480a24deed18cb1ca95344995150f3a3f5c98 (diff) | |
am 1ae480a2: Merge changes I2104037d,I125c4a00 into klp-modular-dev
* commit '1ae480a24deed18cb1ca95344995150f3a3f5c98':
Passing and using defStyle in ViewGroup initFromAttributes.
Set android:descendantFocusability to blocksDescendants for all NumberPicker in clockwork.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions