diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-02-23 19:03:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-23 19:03:29 +0000 |
| commit | 3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b (patch) | |
| tree | 0909b8b9e69c732abefb5c9d673a9deb4bbc2b09 /rs/java/android/renderscript/RenderScript.java | |
| parent | 09e9076ddfd5e9f738cd5096409ff3fb61174803 (diff) | |
| parent | 30a67cd17af03e53b8be5638f7f70d2989a7cd78 (diff) | |
am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev
* commit '30a67cd17af03e53b8be5638f7f70d2989a7cd78':
Set forceFramework correctly for included layouts.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions