diff options
| author | Etan Cohen <etancohen@google.com> | 2015-07-08 19:35:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 19:35:21 +0000 |
| commit | 402ad701c5cd6f3043c00c5109d0416c4a16858e (patch) | |
| tree | e220cebd8513c011719c01f9f331dd507691e3b5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 71aa3b21e3024cd208576b987db07da90d463d02 (diff) | |
| parent | bd966fb069dd823753f2f37ca5297a6632af9c97 (diff) | |
am bd966fb0: am e35c2d2f: am 3aa1b1e5: Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev
* commit 'bd966fb069dd823753f2f37ca5297a6632af9c97':
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