diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-06-04 20:48:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-04 20:48:19 +0000 |
| commit | 905e113f97560dbcf71cab517ab4c1ee4faaa4d3 (patch) | |
| tree | 846d40d8aed9a340c704263a33edf4a83fe4df3b /rs/java/android/renderscript/ProgramFragment.java | |
| parent | 46c3beefad751fde9ba44d092a947df49d94219a (diff) | |
| parent | 03df93bcb854eedc600ef0120fd238ec974c44a1 (diff) | |
am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
* commit '03df93bcb854eedc600ef0120fd238ec974c44a1':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragment.java')
0 files changed, 0 insertions, 0 deletions