diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-13 02:14:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 02:14:48 +0000 |
| commit | 7aaa59f00ed277fdea2fed7ea23a8d24ee219cd2 (patch) | |
| tree | 64159a94b94844e532ebc100925f55fdfb52a163 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d5260dcc67a862bf7936ababe01e27383ea91e31 (diff) | |
| parent | 74ae54e7dc485a82edb1b4876bc1ceaa60a0f34e (diff) | |
am 74ae54e7: am 1d46a343: am 06a87027: (-s ours) am 995c4d51: am b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '74ae54e7dc485a82edb1b4876bc1ceaa60a0f34e':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions