diff options
| author | Etan Cohen <etancohen@google.com> | 2015-07-08 19:22:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 19:22:05 +0000 |
| commit | bd966fb069dd823753f2f37ca5297a6632af9c97 (patch) | |
| tree | 0e5cdc7a5fb3bbdfb291328255d4c8973fce4698 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0d959fd4d350c1bec2b2d2fe8d1369d53dd42940 (diff) | |
| parent | e35c2d2fbc3f5f25db006a51a6e2bc9169389b35 (diff) | |
am e35c2d2f: am 3aa1b1e5: Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev
* commit 'e35c2d2fbc3f5f25db006a51a6e2bc9169389b35':
Lock screen text: consider possible WFC service in APM
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions