diff options
| author | Elliott Hughes <enh@google.com> | 2014-09-26 22:58:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 22:58:28 +0000 |
| commit | 2d895e5b21209e1cf1d3d969e5458e2d0fbbc1e2 (patch) | |
| tree | 5036f340e690d1e21abfe012244f7f3acc161625 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e014f23e92832664270e66cdc9cabc0f3f25479e (diff) | |
| parent | 39aa0d946bc831cc3e25cc60694deaaa1239ca85 (diff) | |
am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev
* commit '70c1f083332729a586d670af7565732a2eb06ab4':
Set the system locale correctly even on an encrypted device.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions