diff options
| author | Fan Zhang <zhfan@google.com> | 2016-04-20 21:17:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-20 21:17:30 +0000 |
| commit | 242b4c6a310a4c88fbae66e64ee9c1a2ee0860c5 (patch) | |
| tree | 7169480116461d0531e647b9a3d3d556aae63bf8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a78d8d303e46b06948e4d2199f9f2942ee09138e (diff) | |
| parent | b6060a3fbc9b1144aa515d17c67bb68eefb83893 (diff) | |
Merge "Allow fragments set their own header view below actionbar." into nyc-mr1-dev
am: b6060a3
* commit 'b6060a3fbc9b1144aa515d17c67bb68eefb83893':
Allow fragments set their own header view below actionbar.
Change-Id: I7958885f68dd6c1de54fb86fe6838ffcea6b6c45
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions