diff options
| author | Lifu Tang <lifu@google.com> | 2018-04-13 09:47:27 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-13 09:47:27 -0700 |
| commit | 581881e092c15b101c011fb64ecd11522e9e5fc8 (patch) | |
| tree | 0c3d6fef09a08e04a51c98598c30d3bb415d03a3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3197513e32ee3e8f3815cb3695e445ef470737da (diff) | |
| parent | b3ac00ea9c4d6b71865a323213a9e35ef37ed1ca (diff) | |
Merge "Mark location-related PendingIntents as restricted" into pi-dev
am: b3ac00ea9c
Change-Id: Ie9ca7886858033c2ca46d090d46e74679b4e0c23
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions