diff options
| author | Justin Koh <justinkoh@google.com> | 2014-05-05 22:45:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-05 22:45:32 +0000 |
| commit | 64bca23370e249509282ae665a99faedaba3b5b8 (patch) | |
| tree | 8b5cb76462f436cbb801206ca1575f82403773ef /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dcde19deba30a3c39afe5d26608e1bbc7fe865f9 (diff) | |
| parent | 8e4cbcce6616aee96754393aaddb23df91bfc02c (diff) | |
am 8e4cbcce: (-s ours) am f8a10d77: Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" into klp-modular-dev
* commit '8e4cbcce6616aee96754393aaddb23df91bfc02c':
Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions