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