diff options
| author | Shirish Kalele <kalele@google.com> | 2015-08-08 02:48:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-08 02:48:37 +0000 |
| commit | 822b4f3a8d8521ff9e003617858779caf38a1558 (patch) | |
| tree | 589015d014723bc2659e8999dc6ce91161f9f0e9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 157c3fbc52c14cbd7fc7ce6ec5b1b4cc9fe627d5 (diff) | |
| parent | 4ecee3f88e067ed0339a4e004996a3c69ce5480e (diff) | |
am 4ecee3f8: am 558f1030: am 74f93f9a: am d7408469: am 027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev
* commit '4ecee3f88e067ed0339a4e004996a3c69ce5480e':
Fix check for caller being the active network scorer
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions