diff options
| author | Andrew Solovay <asolovay@google.com> | 2015-08-16 03:02:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-16 03:02:48 +0000 |
| commit | 3a3e5694d783de124b88c1335e36668a2384d3f3 (patch) | |
| tree | 69de381d8b7c3f00bf975ce676c1ce183055da7e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f1f078ca50c8727236d9791a99cdbaba288abb2e (diff) | |
| parent | feff2de6f93f4846ead588d66cb738f73107f4a2 (diff) | |
am feff2de6: am d81e103a: am 83e0a223: am 7a372767: am eee09f49: Merge "cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18" into mnc-dev
* commit 'feff2de6f93f4846ead588d66cb738f73107f4a2':
cherrypick from mnc-preview-docs docs: Preview 3 permissions docs. Original Change-Id: I4eaf45d98846e2bf9456f5896da4ec3079f4ba18
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions