diff options
| author | Neil Fuller <nfuller@google.com> | 2015-02-10 01:53:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-10 01:53:21 +0000 |
| commit | a10cdf45db64721b377bf25868e9da5ac1c02857 (patch) | |
| tree | dc9f4e183165fc4b10aa506b2627fedd1ba8c166 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 36470f02ef9132eaff7fb997ddea7a554ed591f6 (diff) | |
| parent | 04bd52d77cd489898555e6c529e7fade7f33bd6d (diff) | |
am 37e5a941: Merge "Avoid static initialization of Layout from TextUtils" automerge: 86b9cc3
automerge: 04bd52d
* commit '04bd52d77cd489898555e6c529e7fade7f33bd6d':
Avoid static initialization of Layout from TextUtils
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions