diff options
| author | Vinod Krishnan <vinodkrishnan@google.com> | 2015-03-19 09:42:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-19 09:42:46 +0000 |
| commit | 7a2df74b1124746fa5400d3ed5e6e3680c8f3601 (patch) | |
| tree | 25c341a373793b872b5b7a8654e408b17eb8bcec /rs/java/android/renderscript/RenderScript.java | |
| parent | e711412302a9e84bf14d772795a8ec58537926b9 (diff) | |
| parent | 3f782ad156d337c7c6c542696ddc67ae82fa7a84 (diff) | |
am 3f782ad1: Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev
* commit '3f782ad156d337c7c6c542696ddc67ae82fa7a84':
Make Theme.Micro point to Theme.Material
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions