diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-10-01 00:06:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-01 00:06:09 +0000 |
| commit | 9144d7e4a1ab533d32fdb28bd3824bd973535c6e (patch) | |
| tree | 0981800f9f84397c15176f2871f131cb8cab0e37 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0ec37b9f51749d55ea16471833f4dc3baec2dad8 (diff) | |
| parent | 9ca0ccd7b92bc53de7ce25005a3fec3dd0bfcdf7 (diff) | |
Merge changes from topic 'am-436d8a53ff3c441ca434f7c488dbab82'
* changes:
Merge changes from topic 'cherry-pick' am: e3d5fa1094 am: 12b4883032 am: e8e0ee0789 am: 1c4749f69a
[NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast am: 720d175757 am: 083f313756 am: a06821b2cf am: 1a92c54559
[NAN] Update API javadoc to clarify NAN status change broadcast scope am: 4c22e8bede am: c3066c1d68 am: 4cb72b6125 am: 234039affa
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions