diff options
| author | Robin Lee <rgl@google.com> | 2014-10-21 11:58:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-21 11:58:38 +0000 |
| commit | fc56790085463ab410a5f407a4930b42509ad5f7 (patch) | |
| tree | 58ce3732d71419aa8f22d4867ebd73bb4654b36a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | deddb38462389823c194559052c4d64ee6c3b467 (diff) | |
| parent | e1c9489cc40542bfa2adbb84b6fb77cff4ab8570 (diff) | |
am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev
* commit 'e1c9489cc40542bfa2adbb84b6fb77cff4ab8570':
DevicePolicy: Restore CA warning to K behaviour
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions