diff options
| author | Adam Powell <adamp@google.com> | 2015-06-20 01:07:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-20 01:07:57 +0000 |
| commit | af49d7db968d188ff132ff1cf8bf59ba09602819 (patch) | |
| tree | 06ce58f44a42d82effc33482cda04f56eea642c7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 275b08b5218d8f2ee4c89dcdc430907c39ddefd4 (diff) | |
| parent | 96b879c791551b79b6acc703e2a9b80d453bea49 (diff) | |
am 96b879c7: am b3add4da: Merge "Fix regression in viewing app info from ChooserActivity targets" into mnc-dev
* commit '96b879c791551b79b6acc703e2a9b80d453bea49':
Fix regression in viewing app info from ChooserActivity targets
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions