diff options
| author | Roshan Pius <rpius@google.com> | 2020-01-10 18:39:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-10 18:39:32 +0000 |
| commit | 3f5478a3a0ae6b45381a0876d35f0d62edcf2d98 (patch) | |
| tree | b2aed6936a17f54787d4713a6abc409ebdae8b25 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 40d1c39d69dbd901e197f4ab7e6a653f2ef1a83a (diff) | |
| parent | 6769c541e32b5c6bfc011292fe0c4473263b133f (diff) | |
Merge changes I121b9246,Ib8227067
* changes:
AndroidManifest.xml: Mark NETWORK_SETTINGS_RESET broadcast as protected
Intent: Promote broadcast flag needed by wifi to @SystemApi
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions