diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-06-04 20:25:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-04 20:25:54 +0000 |
| commit | 88c9ca28effb9745d13647bd25d34b6ef53e7cb9 (patch) | |
| tree | 4991447647f6d84a701f3362cc717e29e6ab7906 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 15ceb87a07d9ad1fba4265112492e34c5cc360f5 (diff) | |
| parent | d49f9b25310ac63310b0e5c7aeedca1d9e6ccda0 (diff) | |
am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev
* commit 'd49f9b25310ac63310b0e5c7aeedca1d9e6ccda0':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions